diff --git a/config/demo-prod.json b/config/demo-prod.json
index f9789f1e..ffa1169e 100644
--- a/config/demo-prod.json
+++ b/config/demo-prod.json
@@ -1,6 +1,6 @@
 {
     "useStrict"    : "use strict",
-    "apiUrl"       : "https://api-demo.ottemo.io",
+    "apiUrl"       : "https://api.demo.ottemo.io",
     "mediaPath"    : "https://demo.ottemo.io/media/",
     "itemsPerPage" : "15"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index c40b32bb..49bb3e0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Dashboard",
-  "version": "1.1.14",
+  "version": "1.1.141",
   "description": "Ottemo Administration Tool",
   "main": "gulpfile.js",
   "repository": {
diff --git a/src/app/app.scss b/src/app/app.scss
index ae3b7c42..06961629 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -16,7 +16,7 @@
 @import 'cms/cms';
 @import 'config/config';
 @import 'dashboard/dashboard';
-@import 'design/design';
+@import 'core/core';
 @import 'discounts/discounts';
 @import 'impex/impex';
 @import 'login/login';
diff --git a/src/app/category/service/api.js b/src/app/category/api.service.js
similarity index 100%
rename from src/app/category/service/api.js
rename to src/app/category/api.service.js
diff --git a/src/app/category/controller/edit.js b/src/app/category/edit.controller.js
similarity index 100%
rename from src/app/category/controller/edit.js
rename to src/app/category/edit.controller.js
diff --git a/src/app/category/edit.html b/src/app/category/edit.html
index 7e3a85ce..dc7486d6 100644
--- a/src/app/category/edit.html
+++ b/src/app/category/edit.html
@@ -10,7 +10,7 @@ <h1 ng-if="!category._id">
 </div>
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Tabs editor -->
-<gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="category"></gui-attributes-editor-form-tabs>
+<ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="category"></ot-attributes-editor-form-tabs>
diff --git a/src/app/category/init.js b/src/app/category/init.js
index 0a8cf1f0..1a544e8f 100644
--- a/src/app/category/init.js
+++ b/src/app/category/init.js
@@ -1,4 +1,4 @@
-angular.module("categoryModule", ["ngRoute", "ngResource", "designModule"])
+angular.module("categoryModule", ["ngRoute", "ngResource", "coreModule"])
 
 /*
  *  Basic routing configuration
diff --git a/src/app/category/controller/list.js b/src/app/category/list.controller.js
similarity index 100%
rename from src/app/category/controller/list.js
rename to src/app/category/list.controller.js
diff --git a/src/app/category/list.html b/src/app/category/list.html
index 09c191ba..693d26da 100644
--- a/src/app/category/list.html
+++ b/src/app/category/list.html
@@ -5,5 +5,5 @@ <h1>
 </div>
 
 <!-- Table -->
-<gui-table-manager items="categories" object="this"></gui-table-manager>
+<ot-table-manager items="categories" object="this"></ot-table-manager>
 
diff --git a/src/app/cms/service/api.js b/src/app/cms/api.service.js
similarity index 100%
rename from src/app/cms/service/api.js
rename to src/app/cms/api.service.js
diff --git a/src/app/cms/controller/blockEdit.js b/src/app/cms/block/edit.controller.js
similarity index 100%
rename from src/app/cms/controller/blockEdit.js
rename to src/app/cms/block/edit.controller.js
diff --git a/src/app/cms/block-edit.html b/src/app/cms/block/edit.html
similarity index 53%
rename from src/app/cms/block-edit.html
rename to src/app/cms/block/edit.html
index 22856b8d..c6ec4d8e 100644
--- a/src/app/cms/block-edit.html
+++ b/src/app/cms/block/edit.html
@@ -7,7 +7,7 @@ <h1>
 
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Tabs editor -->
-<gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="block"></gui-attributes-editor-form-tabs>
+<ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="block"></ot-attributes-editor-form-tabs>
diff --git a/src/app/cms/controller/blockList.js b/src/app/cms/block/list.controller.js
similarity index 100%
rename from src/app/cms/controller/blockList.js
rename to src/app/cms/block/list.controller.js
diff --git a/src/app/cms/block-list.html b/src/app/cms/block/list.html
similarity index 59%
rename from src/app/cms/block-list.html
rename to src/app/cms/block/list.html
index 9d278daf..39915bd6 100644
--- a/src/app/cms/block-list.html
+++ b/src/app/cms/block/list.html
@@ -3,4 +3,4 @@ <h1><i class="fa fa-file-text-o"></i> Blocks</h1>
 </div>
 
 <!-- Table -->
-<gui-table-manager items="blocks" object="this"></gui-table-manager>
+<ot-table-manager items="blocks" object="this"></ot-table-manager>
diff --git a/src/app/cms/init.js b/src/app/cms/init.js
index 0dffe039..2a408d14 100644
--- a/src/app/cms/init.js
+++ b/src/app/cms/init.js
@@ -1,29 +1,29 @@
 angular.module('cmsModule', [
     'ngRoute',
     'ngResource',
-    'designModule'
+    'coreModule'
 ])
 
 .config(['$routeProvider', function($routeProvider) {
     $routeProvider
         .when('/cms/pages', {
-            templateUrl: '/views/cms/page-list.html',
+            templateUrl: '/views/cms/page/list.html',
             controller: 'cmsPageListController'
         })
         .when('/cms/pages/:id', {
-            templateUrl: '/views/cms/page-edit.html',
+            templateUrl: '/views/cms/page/edit.html',
             controller: 'cmsPageEditController'
         })
         .when('/cms/blocks', {
-            templateUrl: '/views/cms/block-list.html',
+            templateUrl: '/views/cms/block/list.html',
             controller: 'cmsBlockListController'
         })
         .when('/cms/blocks/:id', {
-            templateUrl: '/views/cms/block-edit.html',
+            templateUrl: '/views/cms/block/edit.html',
             controller: 'cmsBlockEditController'
         })
         .when('/cms/media', {
-            templateUrl: '/views/cms/media-list.html',
+            templateUrl: '/views/cms/media/list.html',
             controller: 'cmsMediaListController'
         });
 
diff --git a/src/app/cms/service/media.js b/src/app/cms/media.service.js
similarity index 100%
rename from src/app/cms/service/media.js
rename to src/app/cms/media.service.js
diff --git a/src/app/cms/controller/mediaList.js b/src/app/cms/media/list.controller.js
similarity index 100%
rename from src/app/cms/controller/mediaList.js
rename to src/app/cms/media/list.controller.js
diff --git a/src/app/cms/media-list.html b/src/app/cms/media/list.html
similarity index 96%
rename from src/app/cms/media-list.html
rename to src/app/cms/media/list.html
index 30ee6455..40680bbe 100644
--- a/src/app/cms/media-list.html
+++ b/src/app/cms/media/list.html
@@ -12,7 +12,7 @@ <h4>Uploading Images</h4>
             <p>Accepted file formats: .jpg, .jpeg, .png, .gif</p>
         </div>
         <div class="col-sm-6">
-            <gui-message-manager item="up.message"></gui-message-manager>
+            <ot-message-manager item="up.message"></ot-message-manager>
 
             <div class="row">
                 <div class="col-xs-8">
diff --git a/src/app/cms/controller/pageEdit.js b/src/app/cms/page/edit.controller.js
similarity index 100%
rename from src/app/cms/controller/pageEdit.js
rename to src/app/cms/page/edit.controller.js
diff --git a/src/app/cms/page-edit.html b/src/app/cms/page/edit.html
similarity index 52%
rename from src/app/cms/page-edit.html
rename to src/app/cms/page/edit.html
index dc6ce030..62bf20b5 100644
--- a/src/app/cms/page-edit.html
+++ b/src/app/cms/page/edit.html
@@ -6,7 +6,7 @@ <h1>
 </div>
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Tabs editor -->
-<gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="page"></gui-attributes-editor-form-tabs>
+<ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="page"></ot-attributes-editor-form-tabs>
diff --git a/src/app/cms/controller/pageList.js b/src/app/cms/page/list.controller.js
similarity index 100%
rename from src/app/cms/controller/pageList.js
rename to src/app/cms/page/list.controller.js
diff --git a/src/app/cms/page-list.html b/src/app/cms/page/list.html
similarity index 61%
rename from src/app/cms/page-list.html
rename to src/app/cms/page/list.html
index 3873e808..cf949c0c 100644
--- a/src/app/cms/page-list.html
+++ b/src/app/cms/page/list.html
@@ -6,4 +6,4 @@ <h1>
 </div>
 
 <!-- Table -->
-<gui-table-manager items="pages" object="this"></gui-table-manager>
+<ot-table-manager items="pages" object="this"></ot-table-manager>
diff --git a/src/app/config/directives/guiConfigEditorForm.js b/src/app/config/directives/ot-config-editor-form.directive.js
similarity index 95%
rename from src/app/config/directives/guiConfigEditorForm.js
rename to src/app/config/directives/ot-config-editor-form.directive.js
index 64aaefe8..ef32564a 100644
--- a/src/app/config/directives/guiConfigEditorForm.js
+++ b/src/app/config/directives/ot-config-editor-form.directive.js
@@ -1,9 +1,9 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 /**
 *  Directive used for automatic attributes editor form creation
 */
-.directive("guiConfigEditorForm", [function () {
+.directive("otConfigEditorForm", [function () {
     return {
         restrict: "E",
         scope: {
@@ -11,7 +11,7 @@ angular.module("designModule")
             "item": "=item",
             "attributes": "=attributesList"
         },
-        templateUrl: "/views/config/gui/configEditorForm.html",
+        templateUrl: "/views/config/directives/ot-config-editor-form.html",
         controller: function ($scope) {
             var updateAttributes, addTab, addFields, sortFieldsInGroups;
 
diff --git a/src/app/config/gui/configEditorForm.html b/src/app/config/directives/ot-config-editor-form.html
similarity index 91%
rename from src/app/config/gui/configEditorForm.html
rename to src/app/config/directives/ot-config-editor-form.html
index e84d27b2..9f371602 100644
--- a/src/app/config/gui/configEditorForm.html
+++ b/src/app/config/directives/ot-config-editor-form.html
@@ -14,7 +14,7 @@
 
         <div class="tab-content animated fadeIn m-t-0">
             <div ng-class='{active:$first,in:$first}' id="collapse{{key}}" class="tab-pane fade" ng-repeat="(key, items) in attributeGroups">
-                <gui-form-builder attributes="items" item="item"></gui-form-builder>
+                <ot-form-builder attributes="items" item="item"></ot-form-builder>
             <div>
         </div>
         <br>
diff --git a/src/app/config/controller/configEdit.js b/src/app/config/edit.controller.js
similarity index 100%
rename from src/app/config/controller/configEdit.js
rename to src/app/config/edit.controller.js
diff --git a/src/app/config/edit.html b/src/app/config/edit.html
index dcd56746..d54dd364 100644
--- a/src/app/config/edit.html
+++ b/src/app/config/edit.html
@@ -7,9 +7,9 @@ <h1>
 
 <div ng-init="init()">
 	<!-- Error message -->
-    <gui-message-manager item="message"></gui-message-manager>
+    <ot-message-manager item="message"></ot-message-manager>
 
 	<!-- Tabs editor -->
-    <gui-config-editor-form attributes-list="sections" object="this" item="items"></gui-config-editor-form>
+    <ot-config-editor-form attributes-list="sections" object="this" item="items"></ot-config-editor-form>
 
 </div>
\ No newline at end of file
diff --git a/src/app/config/filters/storedate.js b/src/app/config/filters/ot-storedate.js
similarity index 100%
rename from src/app/config/filters/storedate.js
rename to src/app/config/filters/ot-storedate.js
diff --git a/src/app/config/init.js b/src/app/config/init.js
index 74d983f4..03a49c1e 100644
--- a/src/app/config/init.js
+++ b/src/app/config/init.js
@@ -1,7 +1,7 @@
 /**
  * Config Module
  */
-angular.module("configModule", ["ngRoute", "ngResource", "designModule"])
+angular.module("configModule", ["ngRoute", "ngResource", "coreModule"])
 
 .config(["$routeProvider", function ($routeProvider) {
     $routeProvider
diff --git a/src/app/design/api.service.js b/src/app/core/api.service.js
similarity index 84%
rename from src/app/design/api.service.js
rename to src/app/core/api.service.js
index e924b1dd..d5d1b98c 100644
--- a/src/app/design/api.service.js
+++ b/src/app/core/api.service.js
@@ -1,8 +1,8 @@
-angular.module("designModule")
+angular.module("coreModule")
 /*
  *  productApiService interaction service
  */
-.service("designApiService", ["$resource", "REST_SERVER_URI", function ($resource, REST_SERVER_URI) {
+.service("coreApiService", ["$resource", "REST_SERVER_URI", function ($resource, REST_SERVER_URI) {
     return $resource(REST_SERVER_URI, {}, {
         "attributesModel": {
             method: "GET",
diff --git a/src/app/design/design.scss b/src/app/core/core.scss
similarity index 100%
rename from src/app/design/design.scss
rename to src/app/core/core.scss
diff --git a/src/app/design/directives/editor/guiArrayModelSelector.js b/src/app/core/directives/editor/ot-array-model-selector.directive.js
similarity index 92%
rename from src/app/design/directives/editor/guiArrayModelSelector.js
rename to src/app/core/directives/editor/ot-array-model-selector.directive.js
index af676ecb..d19aef7d 100644
--- a/src/app/design/directives/editor/guiArrayModelSelector.js
+++ b/src/app/core/directives/editor/ot-array-model-selector.directive.js
@@ -1,14 +1,14 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
  *  Directive used for automatic attribute editor creation
  */
-    .directive("guiArrayModelSelector", [
-        "designApiService",
-        "designImageService",
-        function (designApiService, designImageService) {
+    .directive("otArrayModelSelector", [
+        "coreApiService",
+        "coreImageService",
+        function (coreApiService, coreImageService) {
             return {
                 restrict: "E",
-                templateUrl: "/views/design/gui/editor/arrayModelSelector.html",
+                templateUrl: "/views/core/directives/editor/ot-array-model-selector.html",
 
                 scope: {
                     "attribute": "=editorScope",
@@ -154,7 +154,7 @@ angular.module("designModule")
 
                         parseOptions($scope.attribute.Options);
 
-                        designApiService.attributesModel(getParams(options.model, $scope.item)).$promise.then(
+                        coreApiService.attributesModel(getParams(options.model, $scope.item)).$promise.then(
                             function (response) {
                                 var result = response.result || [];
                                 $scope.items = result;
@@ -169,7 +169,7 @@ angular.module("designModule")
                      * @returns {string}        - full path to image
                      */
                     $scope.getImage = function (image) {
-                        return designImageService.getImage(image);
+                        return coreImageService.getImage(image);
                     };
 
                 }
diff --git a/src/app/design/gui/editor/arrayModelSelector.html b/src/app/core/directives/editor/ot-array-model-selector.html
similarity index 100%
rename from src/app/design/gui/editor/arrayModelSelector.html
rename to src/app/core/directives/editor/ot-array-model-selector.html
diff --git a/src/app/design/directives/editor/guiBoolean.js b/src/app/core/directives/editor/ot-boolean.directive.js
similarity index 83%
rename from src/app/design/directives/editor/guiBoolean.js
rename to src/app/core/directives/editor/ot-boolean.directive.js
index 1f1e6f74..a74d4975 100644
--- a/src/app/design/directives/editor/guiBoolean.js
+++ b/src/app/core/directives/editor/ot-boolean.directive.js
@@ -1,9 +1,9 @@
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiBoolean', [function() {
+.directive('otBoolean', [function() {
     return {
         restrict: 'E',
-        templateUrl: '/views/design/gui/editor/select.html',
+        templateUrl: '/views/core/directives/editor/ot-select.html',
 
         scope: {
             'attribute': '=editorScope',
diff --git a/src/app/design/directives/editor/guiCategorySelector.js b/src/app/core/directives/editor/ot-category-selector.directive.js
similarity index 97%
rename from src/app/design/directives/editor/guiCategorySelector.js
rename to src/app/core/directives/editor/ot-category-selector.directive.js
index bd7a5360..dfc876f4 100644
--- a/src/app/design/directives/editor/guiCategorySelector.js
+++ b/src/app/core/directives/editor/ot-category-selector.directive.js
@@ -1,8 +1,8 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
 *  Directive used for automatic attribute editor creation
 */
-.directive("guiCategorySelector", [
+.directive("otCategorySelector", [
     "$location",
     "$routeParams",
     "dashboardListService",
@@ -16,7 +16,7 @@ angular.module("designModule")
 
         return {
             restrict: "E",
-            templateUrl: "/views/design/gui/editor/categorySelector.html",
+            templateUrl: "/views/core/directives/editor/ot-category-selector.html",
 
             scope: {
                 "attribute": "=editorScope",
diff --git a/src/app/design/gui/editor/categorySelector.html b/src/app/core/directives/editor/ot-category-selector.html
similarity index 88%
rename from src/app/design/gui/editor/categorySelector.html
rename to src/app/core/directives/editor/ot-category-selector.html
index d01ea283..bd329f89 100644
--- a/src/app/design/gui/editor/categorySelector.html
+++ b/src/app/core/directives/editor/ot-category-selector.html
@@ -16,7 +16,7 @@ <h2 class="modal-title text-center">Categories</h2>
 
             <div class="modal-body">
                 <!-- Table -->
-                <gui-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false,'checkbox': false}"></gui-table-manager-popup>
+                <ot-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false,'checkbox': false}"></ot-table-manager-popup>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-primary" ng-click="hide(attribute.Attribute)">Save</button>
diff --git a/src/app/design/directives/editor/guiDatetime.js b/src/app/core/directives/editor/ot-datetime.directive.js
similarity index 93%
rename from src/app/design/directives/editor/guiDatetime.js
rename to src/app/core/directives/editor/ot-datetime.directive.js
index 78662672..46a184ae 100644
--- a/src/app/design/directives/editor/guiDatetime.js
+++ b/src/app/core/directives/editor/ot-datetime.directive.js
@@ -1,16 +1,16 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
 *  Directive used for automatic attribute editor creation
 */
 
-.directive("guiDatetime", [function () {
+.directive("otDatetime", [function () {
     return {
         restrict: "E",
         scope: {
             "attribute": "=editorScope",
             "item": "=item"
         },
-        templateUrl: "/views/design/gui/editor/datetime.html",
+        templateUrl: "/views/core/directives/editor/ot-datetime.html",
 
         controller: [
             "$scope",
diff --git a/src/app/design/gui/editor/datetime.html b/src/app/core/directives/editor/ot-datetime.html
similarity index 100%
rename from src/app/design/gui/editor/datetime.html
rename to src/app/core/directives/editor/ot-datetime.html
diff --git a/src/app/design/directives/editor/guiHtml.js b/src/app/core/directives/editor/ot-html.directive.js
similarity index 62%
rename from src/app/design/directives/editor/guiHtml.js
rename to src/app/core/directives/editor/ot-html.directive.js
index 544f8a2c..1cbad88b 100644
--- a/src/app/design/directives/editor/guiHtml.js
+++ b/src/app/core/directives/editor/ot-html.directive.js
@@ -1,16 +1,16 @@
 /**
  *  Directive used for automatic attribute editor creation
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiHtml', [function() {
+.directive('otHtml', [function() {
     return {
         restrict: 'E',
         scope: {
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/editor/html.html'
+        templateUrl: '/views/core/directives/editor/ot-html.html'
     };
 }]);
 
diff --git a/src/app/design/gui/editor/html.html b/src/app/core/directives/editor/ot-html.html
similarity index 100%
rename from src/app/design/gui/editor/html.html
rename to src/app/core/directives/editor/ot-html.html
diff --git a/src/app/design/directives/editor/guiJsonEditor.js b/src/app/core/directives/editor/ot-json-editor.directive.js
similarity index 94%
rename from src/app/design/directives/editor/guiJsonEditor.js
rename to src/app/core/directives/editor/ot-json-editor.directive.js
index e746efb0..6b7e8792 100644
--- a/src/app/design/directives/editor/guiJsonEditor.js
+++ b/src/app/core/directives/editor/ot-json-editor.directive.js
@@ -1,14 +1,14 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
 *  Directive used for automatic attribute editor creation
 */
-.directive("guiJsonEditor", [function () {
+.directive("otJsonEditor", [function () {
     return {
         restrict: "E",
         scope: {
             "data": "=data"
         },
-        templateUrl: "/views/design/gui/editor/json.html",
+        templateUrl: "/views/core/directives/editor/ot-json.html",
 
         controller: ["$scope", function ($scope) {
             $scope.items = [
diff --git a/src/app/design/gui/editor/json.html b/src/app/core/directives/editor/ot-json.html
similarity index 100%
rename from src/app/design/gui/editor/json.html
rename to src/app/core/directives/editor/ot-json.html
diff --git a/src/app/design/directives/editor/guiModelSelector.js b/src/app/core/directives/editor/ot-model-selector.directive.js
similarity index 91%
rename from src/app/design/directives/editor/guiModelSelector.js
rename to src/app/core/directives/editor/ot-model-selector.directive.js
index f523e844..c4720acf 100644
--- a/src/app/design/directives/editor/guiModelSelector.js
+++ b/src/app/core/directives/editor/ot-model-selector.directive.js
@@ -1,12 +1,12 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 /**
  *  Directive used for automatic attribute editor creation
  */
-    .directive("guiModelSelector", ["designApiService", function (designApiService) {
+    .directive("otModelSelector", ["coreApiService", function (coreApiService) {
         return {
             restrict: "E",
-            templateUrl: "/views/design/gui/editor/modelSelector.html",
+            templateUrl: "/views/core/directives/editor/ot-model-selector.html",
 
             scope: {
                 "attribute": "=editorScope",
@@ -86,7 +86,7 @@ angular.module("designModule")
                         return true;
                     }
 
-                    designApiService.attributesModel(params).$promise.then(
+                    coreApiService.attributesModel(params).$promise.then(
                         function (response) {
                             try {
                                 var result = response.result || [];
diff --git a/src/app/design/gui/editor/modelSelector.html b/src/app/core/directives/editor/ot-model-selector.html
similarity index 100%
rename from src/app/design/gui/editor/modelSelector.html
rename to src/app/core/directives/editor/ot-model-selector.html
diff --git a/src/app/design/directives/editor/guiMultiSelect.js b/src/app/core/directives/editor/ot-multi-select.directive.js
similarity index 92%
rename from src/app/design/directives/editor/guiMultiSelect.js
rename to src/app/core/directives/editor/ot-multi-select.directive.js
index af33f849..6e15fc1d 100644
--- a/src/app/design/directives/editor/guiMultiSelect.js
+++ b/src/app/core/directives/editor/ot-multi-select.directive.js
@@ -1,12 +1,12 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiMultiSelect", [function () {
+.directive("otMultiSelect", [function () {
     return {
         restrict: "E",
-        templateUrl: "/views/design/gui/editor/multi-select.html",
+        templateUrl: "/views/core/directives/editor/ot-multi-select.html",
 
         scope: {
             "attribute": "=editorScope",
diff --git a/src/app/design/gui/editor/multi-select.html b/src/app/core/directives/editor/ot-multi-select.html
similarity index 100%
rename from src/app/design/gui/editor/multi-select.html
rename to src/app/core/directives/editor/ot-multi-select.html
diff --git a/src/app/design/directives/editor/guiMultilineText.js b/src/app/core/directives/editor/ot-multiine-text.directive.js
similarity index 58%
rename from src/app/design/directives/editor/guiMultilineText.js
rename to src/app/core/directives/editor/ot-multiine-text.directive.js
index 3827c0cb..25db5dec 100644
--- a/src/app/design/directives/editor/guiMultilineText.js
+++ b/src/app/core/directives/editor/ot-multiine-text.directive.js
@@ -1,16 +1,16 @@
 /**
  *  Directive used for automatic attribute editor creation
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiMultilineText', [function() {
+.directive('otMultilineText', [function() {
     return {
         restrict: 'E',
         scope: {
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/editor/multilineText.html'
+        templateUrl: '/views/core/directives/editor/ot-multiline-text.html'
     };
 }]);
 
diff --git a/src/app/design/gui/editor/multilineText.html b/src/app/core/directives/editor/ot-multiline-text.html
similarity index 100%
rename from src/app/design/gui/editor/multilineText.html
rename to src/app/core/directives/editor/ot-multiline-text.html
diff --git a/src/app/design/directives/editor/guiNotEditable.js b/src/app/core/directives/editor/ot-not-editable.directive.js
similarity index 64%
rename from src/app/design/directives/editor/guiNotEditable.js
rename to src/app/core/directives/editor/ot-not-editable.directive.js
index 96db767a..b6c7e122 100644
--- a/src/app/design/directives/editor/guiNotEditable.js
+++ b/src/app/core/directives/editor/ot-not-editable.directive.js
@@ -1,16 +1,16 @@
 /**
  *  Directive used for automatic attribute editor creation
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiNotEditable', [function() {
+.directive('otNotEditable', [function() {
     return {
         restrict: 'E',
         scope: {
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/editor/notEditable.html',
+        templateUrl: '/views/core/directives/editor/ot-not-editable.html',
 
         controller: ['$scope', function() {
 
diff --git a/src/app/design/gui/editor/notEditable.html b/src/app/core/directives/editor/ot-not-editable.html
similarity index 100%
rename from src/app/design/gui/editor/notEditable.html
rename to src/app/core/directives/editor/ot-not-editable.html
diff --git a/src/app/design/directives/editor/guiPageSelector.js b/src/app/core/directives/editor/ot-page-selector.directive.js
similarity index 97%
rename from src/app/design/directives/editor/guiPageSelector.js
rename to src/app/core/directives/editor/ot-page-selector.directive.js
index fcd1f336..cfe2bed6 100644
--- a/src/app/design/directives/editor/guiPageSelector.js
+++ b/src/app/core/directives/editor/ot-page-selector.directive.js
@@ -1,8 +1,8 @@
-angular.module("designModule")
+angular.module("coreModule")
 /**
 *  Directive used for automatic attribute editor creation
 */
-.directive("guiPageSelector", [
+.directive("otPageSelector", [
     "$location",
     "$routeParams",
     "dashboardListService",
@@ -17,7 +17,7 @@ angular.module("designModule")
 
         return {
             restrict: "E",
-            templateUrl: "/views/design/gui/editor/pageSelector.html",
+            templateUrl: "/views/core/directives/editor/ot-page-selector.html",
 
             scope: {
                 "attribute": "=editorScope",
diff --git a/src/app/design/gui/editor/pageSelector.html b/src/app/core/directives/editor/ot-page-selector.html
similarity index 88%
rename from src/app/design/gui/editor/pageSelector.html
rename to src/app/core/directives/editor/ot-page-selector.html
index 063aecdd..d6982503 100644
--- a/src/app/design/gui/editor/pageSelector.html
+++ b/src/app/core/directives/editor/ot-page-selector.html
@@ -15,7 +15,7 @@ <h2 class="modal-title text-center">Pages</h2>
 
             <div class="modal-body">
                 <!-- Table -->
-                <gui-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false,'checkbox': false}"></gui-table-manager-popup>
+                <ot-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false,'checkbox': false}"></ot-table-manager-popup>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-primary" ng-click="hide(attribute.Attribute)">Save</button>
diff --git a/src/app/design/directives/editor/guiPassword.js b/src/app/core/directives/editor/ot-password.directive.js
similarity index 51%
rename from src/app/design/directives/editor/guiPassword.js
rename to src/app/core/directives/editor/ot-password.directive.js
index 65b51c5f..70c186f7 100644
--- a/src/app/design/directives/editor/guiPassword.js
+++ b/src/app/core/directives/editor/ot-password.directive.js
@@ -1,13 +1,13 @@
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiPassword', [function() {
+.directive('otPassword', [function() {
     return {
         restrict: 'EA',
         scope: {
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/editor/password.html'
+        templateUrl: '/views/core/directives/editor/ot-password.html'
     };
 }]);
 
diff --git a/src/app/design/gui/editor/password.html b/src/app/core/directives/editor/ot-password.html
similarity index 100%
rename from src/app/design/gui/editor/password.html
rename to src/app/core/directives/editor/ot-password.html
diff --git a/src/app/design/directives/editor/guiPictureManager.js b/src/app/core/directives/editor/ot-picture-manager.directive.js
similarity index 87%
rename from src/app/design/directives/editor/guiPictureManager.js
rename to src/app/core/directives/editor/ot-picture-manager.directive.js
index 60612524..25c1126e 100644
--- a/src/app/design/directives/editor/guiPictureManager.js
+++ b/src/app/core/directives/editor/ot-picture-manager.directive.js
@@ -1,12 +1,12 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiPictureManager", ["designImageService", function (designImageService) {
+.directive("otPictureManager", ["coreImageService", function (coreImageService) {
     return {
         restrict: "E",
-        templateUrl: "/views/design/gui/editor/pictureManager.html",
+        templateUrl: "/views/core/directives/editor/ot-picture-manager.html",
 
         scope: {
             "parent": "=parent",
@@ -44,7 +44,7 @@ angular.module("designModule")
             });
 
             $scope.getImage = function (filename) {
-                return designImageService.getImage($scope.imagesPath + filename);
+                return coreImageService.getImage($scope.imagesPath + filename);
             };
 
             $scope.selectImage = function (filename) {
diff --git a/src/app/design/gui/editor/pictureManager.html b/src/app/core/directives/editor/ot-picture-manager.html
similarity index 93%
rename from src/app/design/gui/editor/pictureManager.html
rename to src/app/core/directives/editor/ot-picture-manager.html
index 37e0d18b..f4d90f82 100644
--- a/src/app/design/gui/editor/pictureManager.html
+++ b/src/app/core/directives/editor/ot-picture-manager.html
@@ -10,14 +10,14 @@
 <br>
 <!-- Upload file -->
 <div class="btn-group">
-    <gui-input-file class="btn btn-success upl-btn"
+    <ot-input-file class="btn btn-success upl-btn"
         input-id="'uploadfile'"
         input-name="'uploadfile'"
         file="parent.uploadfile"
         on-change="parent.imageAdd('uploadfile')">
         <span class="glyphicon glyphicon-cloud-upload" aria-hidden="true"></span>
         Upload file
-    </gui-input-file>
+    </ot-input-file>
     <!-- Remove button -->
     <button class="btn btn-danger" ng-click="parent.imageRemove(parent.selectedImage)" aria-label="Left Align">
         <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
diff --git a/src/app/design/directives/editor/guiPrice.js b/src/app/core/directives/editor/ot-price.directive.js
similarity index 85%
rename from src/app/design/directives/editor/guiPrice.js
rename to src/app/core/directives/editor/ot-price.directive.js
index 7af82490..c713fbe7 100644
--- a/src/app/design/directives/editor/guiPrice.js
+++ b/src/app/core/directives/editor/ot-price.directive.js
@@ -1,16 +1,16 @@
 /**
  *  Directive used for automatic attribute editor creation
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiPrice', [function() {
+.directive('otPrice', [function() {
     return {
         restrict: 'E',
         scope: {
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/editor/text.html',
+        templateUrl: '/views/core/directives/editor/ot-text.html',
 
         controller: ['$scope', function($scope) {
 
diff --git a/src/app/design/directives/editor/guiProductSelector.js b/src/app/core/directives/editor/ot-product-selector.directive.js
similarity index 96%
rename from src/app/design/directives/editor/guiProductSelector.js
rename to src/app/core/directives/editor/ot-product-selector.directive.js
index 3f8273fb..a492b519 100644
--- a/src/app/design/directives/editor/guiProductSelector.js
+++ b/src/app/core/directives/editor/ot-product-selector.directive.js
@@ -1,16 +1,16 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiProductSelector", [
+.directive("otProductSelector", [
 "$location",
 "$routeParams",
 "dashboardListService",
 "productApiService",
-"designImageService",
+"coreImageService",
 "COUNT_ITEMS_PER_PAGE",
-function ($location, $routeParams, DashboardListService, productApiService, designImageService, COUNT_ITEMS_PER_PAGE) {
+function ($location, $routeParams, DashboardListService, productApiService, coreImageService, COUNT_ITEMS_PER_PAGE) {
     var serviceList = new DashboardListService(), showColumns;
     showColumns = {
         'name' : {'type' : 'select-link', 'label' : 'Name'},
@@ -21,7 +21,7 @@ function ($location, $routeParams, DashboardListService, productApiService, desi
 
     return {
         restrict: "E",
-        templateUrl: "/views/design/gui/editor/productSelector.html",
+        templateUrl: "/views/core/directives/editor/ot-product-selector.html",
 
         scope: {
             "attribute": "=editorScope",
@@ -208,7 +208,7 @@ function ($location, $routeParams, DashboardListService, productApiService, desi
              * @returns {string}        - full path to image
              */
             $scope.getImage = function (image) {
-                return designImageService.getImage(image);
+                return coreImageService.getImage(image);
             };
 
             $scope.expand = function () {
diff --git a/src/app/design/gui/editor/productSelector.html b/src/app/core/directives/editor/ot-product-selector.html
similarity index 88%
rename from src/app/design/gui/editor/productSelector.html
rename to src/app/core/directives/editor/ot-product-selector.html
index 3d8563d6..449a22a8 100644
--- a/src/app/design/gui/editor/productSelector.html
+++ b/src/app/core/directives/editor/ot-product-selector.html
@@ -16,7 +16,7 @@ <h2 class="modal-title text-center">Products</h2>
 
             <div class="modal-body">
                 <!-- Table -->
-                <gui-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false}"></gui-table-manager-popup>
+                <ot-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false}"></ot-table-manager-popup>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/src/app/design/directives/editor/guiProductsSelector.js b/src/app/core/directives/editor/ot-products-selector.directive.js
similarity index 96%
rename from src/app/design/directives/editor/guiProductsSelector.js
rename to src/app/core/directives/editor/ot-products-selector.directive.js
index b2625314..84bc0ecd 100644
--- a/src/app/design/directives/editor/guiProductsSelector.js
+++ b/src/app/core/directives/editor/ot-products-selector.directive.js
@@ -1,16 +1,16 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiProductsSelector", [
+.directive("otProductsSelector", [
 "$location",
 "$routeParams",
 "dashboardListService",
 "productApiService",
-"designImageService",
+"coreImageService",
 "COUNT_ITEMS_PER_PAGE",
-function ($location, $routeParams, DashboardListService, productApiService, designImageService, COUNT_ITEMS_PER_PAGE) {
+function ($location, $routeParams, DashboardListService, productApiService, coreImageService, COUNT_ITEMS_PER_PAGE) {
     var serviceList = new DashboardListService(), showColumns;
     showColumns = {
         'name' : {'type' : 'select-link', 'label' : 'Name'},
@@ -21,7 +21,7 @@ function ($location, $routeParams, DashboardListService, productApiService, desi
 
     return {
         restrict: "E",
-        templateUrl: "/views/design/gui/editor/productsSelector.html",
+        templateUrl: "/views/core/directives/editor/ot-products-selector.html",
 
         scope: {
             "attribute": "=editorScope",
@@ -195,7 +195,7 @@ function ($location, $routeParams, DashboardListService, productApiService, desi
              * @returns {string}        - full path to image
              */
             $scope.getImage = function (image) {
-                return designImageService.getImage(image);
+                return coreImageService.getImage(image);
             };
 
             $scope.expand = function () {
diff --git a/src/app/design/gui/editor/productsSelector.html b/src/app/core/directives/editor/ot-products-selector.html
similarity index 88%
rename from src/app/design/gui/editor/productsSelector.html
rename to src/app/core/directives/editor/ot-products-selector.html
index 13b187d1..e1a44f64 100644
--- a/src/app/design/gui/editor/productsSelector.html
+++ b/src/app/core/directives/editor/ot-products-selector.html
@@ -15,7 +15,7 @@ <h2 class="modal-title text-center">Products</h2>
 
             <div class="modal-body">
                 <!-- Table -->
-                <gui-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false,'checkbox': false}"></gui-table-manager-popup>
+                <ot-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false,'checkbox': false}"></ot-table-manager-popup>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-primary" ng-click="hide(attribute.Attribute)">Save</button>
diff --git a/src/app/design/directives/editor/guiSelect.js b/src/app/core/directives/editor/ot-select.directive.js
similarity index 93%
rename from src/app/design/directives/editor/guiSelect.js
rename to src/app/core/directives/editor/ot-select.directive.js
index 9c53c171..cd73ccc7 100644
--- a/src/app/design/directives/editor/guiSelect.js
+++ b/src/app/core/directives/editor/ot-select.directive.js
@@ -1,12 +1,12 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiSelect", [function () {
+.directive("otSelect", [function () {
     return {
         restrict: "E",
-        templateUrl: "/views/design/gui/editor/select.html",
+        templateUrl: "/views/core/directives/editor/ot-select.html",
 
         scope: {
             "attribute": "=editorScope",
diff --git a/src/app/design/gui/editor/select.html b/src/app/core/directives/editor/ot-select.html
similarity index 100%
rename from src/app/design/gui/editor/select.html
rename to src/app/core/directives/editor/ot-select.html
diff --git a/src/app/design/directives/editor/guiText.js b/src/app/core/directives/editor/ot-text.directive.js
similarity index 66%
rename from src/app/design/directives/editor/guiText.js
rename to src/app/core/directives/editor/ot-text.directive.js
index 8cf401e8..778b81f5 100644
--- a/src/app/design/directives/editor/guiText.js
+++ b/src/app/core/directives/editor/ot-text.directive.js
@@ -1,16 +1,16 @@
 /**
  *  Directive used for automatic attribute editor creation
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiText', [function() {
+.directive('otText', [function() {
     return {
         restrict: 'E',
         scope: {
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/editor/text.html',
+        templateUrl: '/views/core/directives/editor/ot-text.html',
 
         controller: ['$scope', function() {}]
     };
diff --git a/src/app/design/gui/editor/text.html b/src/app/core/directives/editor/ot-text.html
similarity index 100%
rename from src/app/design/gui/editor/text.html
rename to src/app/core/directives/editor/ot-text.html
diff --git a/src/app/design/directives/editor/guiVisitorSelector.js b/src/app/core/directives/editor/ot-visitor-selector.directive.js
similarity index 96%
rename from src/app/design/directives/editor/guiVisitorSelector.js
rename to src/app/core/directives/editor/ot-visitor-selector.directive.js
index cc4467e4..498bb922 100644
--- a/src/app/design/directives/editor/guiVisitorSelector.js
+++ b/src/app/core/directives/editor/ot-visitor-selector.directive.js
@@ -1,16 +1,16 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiVisitorSelector", [
+.directive("otVisitorSelector", [
 "$location",
 "$routeParams",
 "dashboardListService",
 "visitorApiService",
-"designImageService",
+"coreImageService",
 "COUNT_ITEMS_PER_PAGE",
-function ($location, $routeParams, DashboardListService, visitorApiService, designImageService, COUNT_ITEMS_PER_PAGE) {
+function ($location, $routeParams, DashboardListService, visitorApiService, coreImageService, COUNT_ITEMS_PER_PAGE) {
     var serviceList = new DashboardListService(), showColumns;
     showColumns = {
         'name' : {'type' : 'select-link', 'label' : 'Name'},
@@ -22,7 +22,7 @@ function ($location, $routeParams, DashboardListService, visitorApiService, desi
 
     return {
         restrict: "E",
-        templateUrl: "/views/design/gui/editor/visitorSelector.html",
+        templateUrl: "/views/core/directives/editor/ot-visitor-selector.html",
 
         scope: {
             "attribute": "=editorScope",
diff --git a/src/app/design/gui/editor/visitorSelector.html b/src/app/core/directives/editor/ot-visitor-selector.html
similarity index 88%
rename from src/app/design/gui/editor/visitorSelector.html
rename to src/app/core/directives/editor/ot-visitor-selector.html
index 3c31b1d1..9a1fd83b 100644
--- a/src/app/design/gui/editor/visitorSelector.html
+++ b/src/app/core/directives/editor/ot-visitor-selector.html
@@ -14,7 +14,7 @@ <h3 class="modal-title text-center">Products</h3>
             </div>
 
             <div class="modal-body">
-                <gui-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false}"></gui-table-manager-popup>
+                <ot-table-manager-popup items="items" object="this" buttons="{'new':false,'delete':false}"></ot-table-manager-popup>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-primary" ng-click="hide(attribute.Attribute)">Save and close</button>
diff --git a/src/app/design/directives/filter/guiDateRange.js b/src/app/core/directives/filter/ot-date-range.direcitve.js
similarity index 92%
rename from src/app/design/directives/filter/guiDateRange.js
rename to src/app/core/directives/filter/ot-date-range.direcitve.js
index 1e6dcd84..df72fc8a 100644
--- a/src/app/design/directives/filter/guiDateRange.js
+++ b/src/app/core/directives/filter/ot-date-range.direcitve.js
@@ -1,6 +1,6 @@
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiFilterDateRange", [function() {
+.directive("otFilterDateRange", [function() {
     return {
         restrict: "E",
         scope: {
@@ -8,7 +8,7 @@ angular.module("designModule")
             "attribute": "=editorScope",
             "item": "=item"
         },
-        templateUrl: "/views/design/gui/filter/dateRange.html",
+        templateUrl: "/views/core/directives/filter/ot-date-range.html",
 
         controller: ["$scope", function($scope) {
             $scope.highInvalid = false;
diff --git a/src/app/design/gui/filter/dateRange.html b/src/app/core/directives/filter/ot-date-range.html
similarity index 100%
rename from src/app/design/gui/filter/dateRange.html
rename to src/app/core/directives/filter/ot-date-range.html
diff --git a/src/app/design/directives/filter/guiRange.js b/src/app/core/directives/filter/ot-range.directive.js
similarity index 92%
rename from src/app/design/directives/filter/guiRange.js
rename to src/app/core/directives/filter/ot-range.directive.js
index 28ef54c0..51252e92 100644
--- a/src/app/design/directives/filter/guiRange.js
+++ b/src/app/core/directives/filter/ot-range.directive.js
@@ -1,6 +1,6 @@
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiFilterRange', function() {
+.directive('otFilterRange', function() {
     return {
         restrict: 'E',
         scope: {
@@ -8,7 +8,7 @@ angular.module('designModule')
             'attribute': '=editorScope',
             'item': '=item'
         },
-        templateUrl: '/views/design/gui/filter/range.html',
+        templateUrl: '/views/core/directives/filter/ot-range.html',
 
         controller: function($scope) {
 
diff --git a/src/app/design/gui/filter/range.html b/src/app/core/directives/filter/ot-range.html
similarity index 100%
rename from src/app/design/gui/filter/range.html
rename to src/app/core/directives/filter/ot-range.html
diff --git a/src/app/design/directives/filter/guiSelect.js b/src/app/core/directives/filter/ot-select.directive.js
similarity index 95%
rename from src/app/design/directives/filter/guiSelect.js
rename to src/app/core/directives/filter/ot-select.directive.js
index 6c76ec3a..625eb0c0 100644
--- a/src/app/design/directives/filter/guiSelect.js
+++ b/src/app/core/directives/filter/ot-select.directive.js
@@ -1,12 +1,12 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiFilterSelect", [function () {
+.directive("otFilterSelect", [function () {
     return {
         restrict: "E",
-        templateUrl: "/views/design/gui/filter/select.html",
+        templateUrl: "/views/core/directives/filter/ot-select.html",
 
         scope: {
             "parent": "=object",
diff --git a/src/app/design/gui/filter/select.html b/src/app/core/directives/filter/ot-select.html
similarity index 100%
rename from src/app/design/gui/filter/select.html
rename to src/app/core/directives/filter/ot-select.html
diff --git a/src/app/design/directives/filter/guiText.js b/src/app/core/directives/filter/ot-text.directive.js
similarity index 91%
rename from src/app/design/directives/filter/guiText.js
rename to src/app/core/directives/filter/ot-text.directive.js
index bdbfc8ec..3a3ee561 100644
--- a/src/app/design/directives/filter/guiText.js
+++ b/src/app/core/directives/filter/ot-text.directive.js
@@ -1,9 +1,9 @@
 /**
 *  Directive used for automatic attribute editor creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiFilterText", [function () {
+.directive("otFilterText", [function () {
     return {
         restrict: "E",
         scope: {
@@ -11,7 +11,7 @@ angular.module("designModule")
             "attribute": "=editorScope",
             "item": "=item"
         },
-        templateUrl: "/views/design/gui/filter/text.html",
+        templateUrl: "/views/core/directives/filter/ot-text.html",
 
         controller: ["$scope",
             function ($scope) {
diff --git a/src/app/design/gui/filter/text.html b/src/app/core/directives/filter/ot-text.html
similarity index 100%
rename from src/app/design/gui/filter/text.html
rename to src/app/core/directives/filter/ot-text.html
diff --git a/src/app/design/directives/otApplyValidator.js b/src/app/core/directives/ot-apply-validator.directive.js
similarity index 97%
rename from src/app/design/directives/otApplyValidator.js
rename to src/app/core/directives/ot-apply-validator.directive.js
index bbe6a052..c123c669 100644
--- a/src/app/design/directives/otApplyValidator.js
+++ b/src/app/core/directives/ot-apply-validator.directive.js
@@ -1,5 +1,5 @@
 
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otApplyValidator", function ($parse, $compile) {
 
diff --git a/src/app/design/directives/guiAttributesEditorFormTabs.js b/src/app/core/directives/ot-attributes-editor-form-tabs.directive.js
similarity index 92%
rename from src/app/design/directives/guiAttributesEditorFormTabs.js
rename to src/app/core/directives/ot-attributes-editor-form-tabs.directive.js
index 86a6d61b..dc1ad8fc 100644
--- a/src/app/design/directives/guiAttributesEditorFormTabs.js
+++ b/src/app/core/directives/ot-attributes-editor-form-tabs.directive.js
@@ -3,9 +3,9 @@
 *
 *  Form to edit with tabs
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiAttributesEditorFormTabs", ["dashboardUtilsService", function (dashboardUtilsService) {
+.directive("otAttributesEditorFormTabs", ["dashboardUtilsService", function (dashboardUtilsService) {
     return {
         restrict: "E",
         scope: {
@@ -13,7 +13,7 @@ angular.module("designModule")
             "item": "=item",
             "attributes": "=attributesList"
         },
-        templateUrl: "/views/design/gui/attributesEditorFormTabs.html",
+        templateUrl: "/views/core/directives/ot-attributes-editor-form-tabs.html",
         controller: function ($scope) {
             var updateAttributes;
 
diff --git a/src/app/design/gui/attributesEditorFormTabs.html b/src/app/core/directives/ot-attributes-editor-form-tabs.html
similarity index 92%
rename from src/app/design/gui/attributesEditorFormTabs.html
rename to src/app/core/directives/ot-attributes-editor-form-tabs.html
index 1cefb886..802c49d6 100644
--- a/src/app/design/gui/attributesEditorFormTabs.html
+++ b/src/app/core/directives/ot-attributes-editor-form-tabs.html
@@ -17,7 +17,7 @@
     <div class="tab-content">
         <div ng-class='{active:$first,in:$first}' id="collapse{{key}}" class="tab-pane fade"
              ng-repeat="(key, items) in attributeGroups">
-            <gui-form-builder attributes="items" item="item" object="parent"></gui-form-builder>
+            <ot-form-builder attributes="items" item="item" object="parent"></ot-form-builder>
         </div>
         <br>
         <div class="text-center">
diff --git a/src/app/design/directives/guiAttributesEditorForm.js b/src/app/core/directives/ot-attributes-editor-form.directive.js
similarity index 90%
rename from src/app/design/directives/guiAttributesEditorForm.js
rename to src/app/core/directives/ot-attributes-editor-form.directive.js
index cd58a603..5dc00e18 100644
--- a/src/app/design/directives/guiAttributesEditorForm.js
+++ b/src/app/core/directives/ot-attributes-editor-form.directive.js
@@ -3,9 +3,9 @@
 *
 *  Form to edit as accordion
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiAttributesEditorForm", [function () {
+.directive("otAttributesEditorForm", [function () {
     return {
         restrict: "E",
         scope: {
@@ -13,7 +13,7 @@ angular.module("designModule")
             "item": "=item",
             "attributes": "=attributesList"
         },
-        templateUrl: "/views/design/gui/attributesEditorForm.html",
+        templateUrl: "/views/core/directives/ot-attributes-editor-form.html",
         controller: function ($scope) {
             var updateAttributes;
             updateAttributes = function () {
diff --git a/src/app/design/gui/attributesEditorForm.html b/src/app/core/directives/ot-attributes-editor-form.html
similarity index 89%
rename from src/app/design/gui/attributesEditorForm.html
rename to src/app/core/directives/ot-attributes-editor-form.html
index 05238947..d227b3ad 100644
--- a/src/app/design/gui/attributesEditorForm.html
+++ b/src/app/core/directives/ot-attributes-editor-form.html
@@ -14,7 +14,7 @@ <h4 class="panel-title">
 
                 <div id="collapse{{key}}" class="panel-collapse collapse in">
                     <div class="panel-body">
-                        <gui-form-builder attributes="items" item="item"></gui-form-builder>
+                        <ot-form-builder attributes="items" item="item"></ot-form-builder>
                     </div>
                 </div>
             </div>
diff --git a/src/app/design/directives/otBindFile.js b/src/app/core/directives/ot-bind-file.directive.js
similarity index 95%
rename from src/app/design/directives/otBindFile.js
rename to src/app/core/directives/ot-bind-file.directive.js
index b707f265..ea14f889 100644
--- a/src/app/design/directives/otBindFile.js
+++ b/src/app/core/directives/ot-bind-file.directive.js
@@ -7,7 +7,7 @@
  *
  * @template input[type=file ot-bind-file=filesModel]
  */
-angular.module('designModule')
+angular.module('coreModule')
 
 .directive('otBindFile', ['$parse', function($parse) {
     return {
diff --git a/src/app/design/directives/otEnter.js b/src/app/core/directives/ot-enter.directive.js
similarity index 92%
rename from src/app/design/directives/otEnter.js
rename to src/app/core/directives/ot-enter.directive.js
index 6cfcd9b4..d47bf3f6 100644
--- a/src/app/design/directives/otEnter.js
+++ b/src/app/core/directives/ot-enter.directive.js
@@ -1,4 +1,4 @@
-angular.module('designModule')
+angular.module('coreModule')
 
 .directive('otEnter', function() {
     return function(scope, element, attrs) {
diff --git a/src/app/design/directives/guiFormBuilder.js b/src/app/core/directives/ot-form-builder.directive.js
similarity index 76%
rename from src/app/design/directives/guiFormBuilder.js
rename to src/app/core/directives/ot-form-builder.directive.js
index e325cc73..0816f977 100644
--- a/src/app/design/directives/guiFormBuilder.js
+++ b/src/app/core/directives/ot-form-builder.directive.js
@@ -1,9 +1,9 @@
 /**
  *  Directive used for automatic attributes editor form creation
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiFormBuilder', [function() {
+.directive('otFormBuilder', [function() {
     return {
         restrict: 'E',
         scope: {
@@ -11,7 +11,7 @@ angular.module('designModule')
             'item': '=item',
             'attributes': '=attributes'
         },
-        templateUrl: '/views/design/gui/formBuilder.html',
+        templateUrl: '/views/core/directives/ot-form-builder.html',
         controller: ['$scope',
             function($scope) {
                 if (typeof $scope.parent === 'undefined') {
diff --git a/src/app/design/gui/formBuilder.html b/src/app/core/directives/ot-form-builder.html
similarity index 88%
rename from src/app/design/gui/formBuilder.html
rename to src/app/core/directives/ot-form-builder.html
index 6c52df2d..dd59c01f 100644
--- a/src/app/design/gui/formBuilder.html
+++ b/src/app/core/directives/ot-form-builder.html
@@ -3,7 +3,7 @@
 
         <div class="form-group col-xs-12 col-sm-6" ng-switch-when="not_editable">
             <label>{{attribute.Label}} <span  ng-show="attribute.IsRequired">*</span></label>
-            <gui-not-editable editor-scope="attribute" item="item"></gui-not-editable>
+            <ot-not-editable editor-scope="attribute" item="item"></ot-not-editable>
         </div>
 
         <div class="form-group col-xs-12 col-sm-6" ng-switch-when="multiline_text"
@@ -17,9 +17,9 @@
                     <i class="fa fa-info-circle"></i>
                 </a>
             </label>
-            <gui-multiline-text editor-scope="attribute"
+            <ot-multiline-text editor-scope="attribute"
                 item="item">
-            </gui-multiline-text>
+            </ot-multiline-text>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -34,7 +34,7 @@
              ng-class="{ 'has-error' : (parent.form.submitted && parent.form.{{attribute.Attribute}}.$invalid) ||
                        (parent.form.{{attribute.Attribute}}.$invalid && !parent.form.{{attribute.Attribute}}.$pristine) }">
 
-            <gui-html editor-scope="attribute" item="item"></gui-html>
+            <ot-html editor-scope="attribute" item="item"></ot-html>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -58,11 +58,11 @@
                     <i class="fa fa-info-circle"></i>
                 </a>
             </label>
-            <gui-text editor-scope="attribute"
+            <ot-text editor-scope="attribute"
                 item="item"
                 ng-required="attribute.IsRequired"
                 name="attribute.Attribute">
-            </gui-text>
+            </ot-text>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -78,8 +78,8 @@
              (parent.form.{{attribute.Attribute}}.$invalid && !parent.form.{{attribute.Attribute}}.$pristine) }">
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-price editor-scope="attribute" item="item" ng-required="attribute.IsRequired"
-                      name="attribute.Attribute"></gui-price>
+            <ot-price editor-scope="attribute" item="item" ng-required="attribute.IsRequired"
+                      name="attribute.Attribute"></ot-price>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -95,7 +95,7 @@
                        (parent.form.{{attribute.Attribute}}.$invalid && !parent.form.{{attribute.Attribute}}.$pristine) }">
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-datetime editor-scope="attribute" item="item"></gui-datetime>
+            <ot-datetime editor-scope="attribute" item="item"></ot-datetime>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -111,7 +111,7 @@
                        (parent.form.{{attribute.Attribute}}.$invalid && !parent.form.{{attribute.Attribute}}.$pristine) }">
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-model-selector editor-scope="attribute" item="item"></gui-model-selector>
+            <ot-model-selector editor-scope="attribute" item="item"></ot-model-selector>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -127,7 +127,7 @@
                        (parent.form.{{attribute.Attribute}}.$invalid && !parent.form.{{attribute.Attribute}}.$pristine) }">
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-array-model-selector editor-scope="attribute" item="item"></gui-array-model-selector>
+            <ot-array-model-selector editor-scope="attribute" item="item"></ot-array-model-selector>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -140,7 +140,7 @@
 
         <div ng-switch-when="password"
             class="form-group col-xs-12 col-sm-6">
-            <gui-password item="item" editor-scope="attribute"></gui-password>
+            <ot-password item="item" editor-scope="attribute"></ot-password>
         </div>
 
         <div class="form-group col-xs-12 col-sm-6" ng-switch-when="boolean"
@@ -155,9 +155,9 @@
                     <i class="fa fa-info-circle"></i>
                 </a>
             </label>
-            <gui-boolean editor-scope="attribute"
+            <ot-boolean editor-scope="attribute"
                 item="item">
-            </gui-boolean>
+            </ot-boolean>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -173,7 +173,7 @@
                        (parent.form.{{attribute.Attribute}}.$invalid && !parent.form.{{attribute.Attribute}}.$pristine) }">
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-select editor-scope="attribute" item="item"></gui-select>
+            <ot-select editor-scope="attribute" item="item"></ot-select>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -189,7 +189,7 @@
                        (parent.form.{{attribute.Attribute}}.$invalid && !parent.form.{{attribute.Attribute}}.$pristine) }">
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-select editor-scope="attribute" item="item"></gui-select>
+            <ot-select editor-scope="attribute" item="item"></ot-select>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -205,7 +205,7 @@
                        (parent.form.{{attribute.Attribute}}.$invalid && !parent.form.{{attribute.Attribute}}.$pristine) }">
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-multi-select editor-scope="attribute" item="item"></gui-multi-select>
+            <ot-multi-select editor-scope="attribute" item="item"></ot-multi-select>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -219,33 +219,33 @@
         <div class="form-group col-xs-12" ng-switch-when="visitor_selector">
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-visitor-selector editor-scope="attribute" item="item"></gui-visitor-selector>
+            <ot-visitor-selector editor-scope="attribute" item="item"></ot-visitor-selector>
         </div>
 
         <div class="form-group col-xs-12 col-sm-6" ng-switch-when="category_selector">
             <label>{{attribute.Label}} <span ng-show="attribute.IsRequired">*</span></label>
-            <gui-category-selector editor-scope="attribute" item="item"></gui-category-selector>
+            <ot-category-selector editor-scope="attribute" item="item"></ot-category-selector>
         </div>
 
 
         <div class="form-group col-xs-12 col-sm-6" ng-switch-when="page_selector">
           <label>{{attribute.Label}} <span ng-show="attribute.IsRequired">*</span></label>
-          <gui-page-selector editor-scope="attribute" item="item"></gui-page-selector>
+          <ot-page-selector editor-scope="attribute" item="item"></ot-page-selector>
         </div>
 
         <div class="form-group col-xs-12 col-sm-6" ng-switch-when="products_selector">
           <label>{{attribute.Label}} <span ng-show="attribute.IsRequired">*</span></label>
-          <gui-products-selector editor-scope="attribute" item="item" parent="parent"></gui-products-selector>
+          <ot-products-selector editor-scope="attribute" item="item" parent="parent"></ot-products-selector>
         </div>
 
         <!-- Product options -->
         <div ng-switch-when="product_options">
-            <gui-custom-options-manager editor-scope="attribute" item="item"></gui-custom-options-manager>
+            <ot-custom-options-manager editor-scope="attribute" item="item"></ot-custom-options-manager>
         </div>
 
         <!-- Pictures manager -->
          <div class="container text-center" ng-switch-when="picture_manager">
-            <gui-picture-manager item="item" parent="parent"></gui-picture-manager>
+            <ot-picture-manager item="item" parent="parent"></ot-picture-manager>
         </div>
 
         <div class="form-group col-xs-12 col-sm-6" ng-switch-default
@@ -254,7 +254,7 @@
 
             <label>{{attribute.Label}} <span class="asterisk"
                                              ng-show="attribute.IsRequired">*</span></label>
-            <gui-text editor-scope="attribute" item="item"></gui-text>
+            <ot-text editor-scope="attribute" item="item"></ot-text>
 
             <p ng-show="(parent.form.submitted && parent.form.{{attribute.Attribute}}.$error.required)"
                class="help-block">This field is required.</p>
@@ -268,7 +268,7 @@
         <!-- Selector products with modal -->
         <div class="form-group col-xs-12 col-sm-6" ng-switch-when="product_selector">
             <label>{{attribute.Label}} <span ng-show="attribute.IsRequired">*</span></label>
-            <gui-product-selector editor-scope="attribute" item="item" parent="parent"></gui-product-selector>
+            <ot-product-selector editor-scope="attribute" item="item" parent="parent"></ot-product-selector>
         </div>
 
     </div>
diff --git a/src/app/design/directives/guiInputFile.js b/src/app/core/directives/ot-input-file.directive.js
similarity index 91%
rename from src/app/design/directives/guiInputFile.js
rename to src/app/core/directives/ot-input-file.directive.js
index ef7a82ef..a315146a 100644
--- a/src/app/design/directives/guiInputFile.js
+++ b/src/app/core/directives/ot-input-file.directive.js
@@ -1,9 +1,9 @@
 // Directive for file input value binding
 // Hides file input and wraps it within button element
 // to provide better possibilities for styling
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiInputFile', [function() {
+.directive('otInputFile', [function() {
     return {
         restrict: 'E',
         scope: {
@@ -12,7 +12,7 @@ angular.module('designModule')
             'name': '=inputName', // file input name attribute
             'onChange': '&' // On change event listener
         },
-        templateUrl: '/views/design/gui/inputFile.html',
+        templateUrl: '/views/core/directives/ot-input-file.html',
         replace: true,
         transclude: true,
 
diff --git a/src/app/design/gui/inputFile.html b/src/app/core/directives/ot-input-file.html
similarity index 100%
rename from src/app/design/gui/inputFile.html
rename to src/app/core/directives/ot-input-file.html
diff --git a/src/app/design/directives/guiListManager.js b/src/app/core/directives/ot-list-manager.directive.js
similarity index 96%
rename from src/app/design/directives/guiListManager.js
rename to src/app/core/directives/ot-list-manager.directive.js
index 80f802af..84749c46 100644
--- a/src/app/design/directives/guiListManager.js
+++ b/src/app/core/directives/ot-list-manager.directive.js
@@ -1,7 +1,7 @@
 /**
 *  Directive used for automatic attributes editor form creation
 *
-*  guiListManager:
+*  otListManager:
 *
 *  Variables:
 *      items   - array of items for list
@@ -17,9 +17,9 @@
 *      $scope.hasImage {boolean}   - Returns an indication the list has images or not
 *      $scope.getListType {string} - Returns the necessary class for list
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiListManager", [function () {
+.directive("otListManager", [function () {
     return {
         restrict: "E",
         scope: {
@@ -28,7 +28,7 @@ angular.module("designModule")
             "addNewDisable": "=addNewDisable",
             "mapping": "=mapping"
         },
-        templateUrl: "/views/design/gui/list.html",
+        templateUrl: "/views/core/directives/ot-list.html",
         controller: function ($scope) {
 
 			var assignMapping = function (mapping) {
diff --git a/src/app/design/gui/list.html b/src/app/core/directives/ot-list.html
similarity index 100%
rename from src/app/design/gui/list.html
rename to src/app/core/directives/ot-list.html
diff --git a/src/app/design/directives/guiMessageManager.js b/src/app/core/directives/ot-message-manager.directive.js
similarity index 85%
rename from src/app/design/directives/guiMessageManager.js
rename to src/app/core/directives/ot-message-manager.directive.js
index 847ee54d..ffc96bb6 100644
--- a/src/app/design/directives/guiMessageManager.js
+++ b/src/app/core/directives/ot-message-manager.directive.js
@@ -1,12 +1,12 @@
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiMessageManager', ['$timeout', function($timeout) {
+.directive('otMessageManager', ['$timeout', function($timeout) {
     return {
         restrict: 'E',
         scope: {
             'obj': '=item'
         },
-        templateUrl: '/views/design/gui/guiMessageManager.html',
+        templateUrl: '/views/core/directives/ot-message-manager.html',
         link: function($scope) {
             var timeout;
             $scope.isShow = false;
diff --git a/src/app/design/gui/guiMessageManager.html b/src/app/core/directives/ot-message-manager.html
similarity index 100%
rename from src/app/design/gui/guiMessageManager.html
rename to src/app/core/directives/ot-message-manager.html
diff --git a/src/app/design/directives/guiPaginator.js b/src/app/core/directives/ot-paginator.directive.js
similarity index 87%
rename from src/app/design/directives/guiPaginator.js
rename to src/app/core/directives/ot-paginator.directive.js
index 659cf350..44671f0b 100644
--- a/src/app/design/directives/guiPaginator.js
+++ b/src/app/core/directives/ot-paginator.directive.js
@@ -3,15 +3,15 @@
  * setPage(page)
  * getPages()
  */
-angular.module('designModule')
+angular.module('coreModule')
 
-.directive('guiPaginator', ['$location', function($location) {
+.directive('otPaginator', ['$location', function($location) {
     return {
         restrict: 'E',
         scope: {
             'parent': '=object'
         },
-        templateUrl: '/views/design/gui/paginator.html',
+        templateUrl: '/views/core/directives/ot-paginator.html',
         controller: ['$scope', function($scope) {
 
             var countNeighbors = 4;
diff --git a/src/app/design/gui/paginator.html b/src/app/core/directives/ot-paginator.html
similarity index 100%
rename from src/app/design/gui/paginator.html
rename to src/app/core/directives/ot-paginator.html
diff --git a/src/app/design/directives/otRouteClass.js b/src/app/core/directives/ot-route-class.directive.js
similarity index 98%
rename from src/app/design/directives/otRouteClass.js
rename to src/app/core/directives/ot-route-class.directive.js
index 9ed65ed4..e161ba31 100644
--- a/src/app/design/directives/otRouteClass.js
+++ b/src/app/core/directives/ot-route-class.directive.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive('otRouteClass', [function() {
     return {
diff --git a/src/app/design/directives/guiTableManagerPopup.js b/src/app/core/directives/ot-table-manager-popup.directive.js
similarity index 99%
rename from src/app/design/directives/guiTableManagerPopup.js
rename to src/app/core/directives/ot-table-manager-popup.directive.js
index f5b88d1a..b5b50da6 100644
--- a/src/app/design/directives/guiTableManagerPopup.js
+++ b/src/app/core/directives/ot-table-manager-popup.directive.js
@@ -1,9 +1,9 @@
 /**
 *  Directive used for automatic attributes editor form creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiTableManagerPopup", [
+.directive("otTableManagerPopup", [
     "$location",
     "COUNT_ITEMS_PER_PAGE",
     function ($location, COUNT_ITEMS_PER_PAGE) {
@@ -15,7 +15,7 @@ angular.module("designModule")
                 "buttonData": "=buttons",
                 "mapping": "=mapping"
             },
-            templateUrl: "/views/design/gui/table-popup.html",
+            templateUrl: "/views/core/directives/ot-table-manager-popup.html",
             controller: function ($scope) {
                 // Variables
                 var isInit, isSelectedAll, activeFilters;
diff --git a/src/app/design/gui/table-popup.html b/src/app/core/directives/ot-table-manager-popup.html
similarity index 88%
rename from src/app/design/gui/table-popup.html
rename to src/app/core/directives/ot-table-manager-popup.html
index 52745f63..28b23055 100644
--- a/src/app/design/gui/table-popup.html
+++ b/src/app/core/directives/ot-table-manager-popup.html
@@ -2,7 +2,7 @@
     <form role="form" class="form-group  ">
 
         <!-- Pagination -->
-        <gui-paginator object="this"></gui-paginator>
+        <ot-paginator object="this"></ot-paginator>
 
         <div class="table-responsive">
             <table class="table table-hover table-bordered table-striped">
@@ -25,15 +25,15 @@
                         <th ng-if="buttons.checkbox">&nbsp;</th>
                         <th ng-repeat="filter in filters" ng-switch="filter.type" ng-show="parent.fields[$index].visible">
                             <div ng-switch-when="text">
-                                <gui-filter-text editor-scope="filter.attributes" item="filter" object="this"></gui-filter-text>
+                                <ot-filter-text editor-scope="filter.attributes" item="filter" object="this"></ot-filter-text>
                             </div>
 
                             <div ng-switch-when="range">
-                                <gui-filter-range editor-scope="filter.attributes" item="filter" object="this"></gui-filter-range>
+                                <ot-filter-range editor-scope="filter.attributes" item="filter" object="this"></ot-filter-range>
                             </div>
 
                             <div ng-switch-when="select">
-                                <gui-filter-select editor-scope="filter.attributes" item="filter" object="this"></gui-filter-select>
+                                <ot-filter-select editor-scope="filter.attributes" item="filter" object="this"></ot-filter-select>
                             </div>
                             <div ng-switch-default="">
                                 &nbsp;
@@ -81,7 +81,7 @@
         </div>
 
         <!-- Pagination -->
-        <gui-paginator object="this"></gui-paginator>
+        <ot-paginator object="this"></ot-paginator>
 
         <div class="clearfix"></div>
     </form>
diff --git a/src/app/design/directives/guiTableManager.js b/src/app/core/directives/ot-table-manager.directive.js
similarity index 99%
rename from src/app/design/directives/guiTableManager.js
rename to src/app/core/directives/ot-table-manager.directive.js
index 66d17c93..2e989d76 100644
--- a/src/app/design/directives/guiTableManager.js
+++ b/src/app/core/directives/ot-table-manager.directive.js
@@ -1,9 +1,9 @@
 /**
 *  Directive used for automatic attributes editor form creation
 */
-angular.module("designModule")
+angular.module("coreModule")
 
-.directive("guiTableManager", [
+.directive("otTableManager", [
     "$location",
     "COUNT_ITEMS_PER_PAGE",
     function ($location, COUNT_ITEMS_PER_PAGE) {
@@ -15,7 +15,7 @@ angular.module("designModule")
                 "buttonData": "=buttons",
                 "mapping": "=mapping"
             },
-            templateUrl: "/views/design/gui/table.html",
+            templateUrl: "/views/core/directives/ot-table-manager.html",
             controller: function ($scope) {
                 // Variables
                 var isInit, isSelectedAll, activeFilters;
diff --git a/src/app/design/gui/table.html b/src/app/core/directives/ot-table-manager.html
similarity index 87%
rename from src/app/design/gui/table.html
rename to src/app/core/directives/ot-table-manager.html
index c46410f9..e55e4201 100644
--- a/src/app/design/gui/table.html
+++ b/src/app/core/directives/ot-table-manager.html
@@ -28,7 +28,7 @@
         </div>
 
         <!-- Pagination -->
-        <gui-paginator object="this"></gui-paginator>
+        <ot-paginator object="this"></ot-paginator>
 
         <div class="table-responsive">
             <table class="table table-hover table-bordered table-striped">
@@ -52,19 +52,19 @@
                         <td>&nbsp;</td>
                         <td ng-repeat="filter in filters" ng-switch="filter.type" ng-show="parent.fields[$index].visible">
                             <div ng-switch-when="text">
-                                <gui-filter-text editor-scope="filter.attributes" item="filter" object="this"></gui-filter-text>
+                                <ot-filter-text editor-scope="filter.attributes" item="filter" object="this"></ot-filter-text>
                             </div>
 
                             <div ng-switch-when="range">
-                                <gui-filter-range editor-scope="filter.attributes" item="filter" object="this"></gui-filter-range>
+                                <ot-filter-range editor-scope="filter.attributes" item="filter" object="this"></ot-filter-range>
                             </div>
 
                             <div ng-switch-when="select">
-                                <gui-filter-select editor-scope="filter.attributes" item="filter" object="this"></gui-filter-select>
+                                <ot-filter-select editor-scope="filter.attributes" item="filter" object="this"></ot-filter-select>
                             </div>
 
                             <div ng-switch-when="date_range">
-                                <gui-filter-date-range editor-scope="filter.attributes" item="filter" object="this"></gui-filter-date-range>
+                                <ot-filter-date-range editor-scope="filter.attributes" item="filter" object="this"></ot-filter-date-range>
                             </div>
 
                             <div ng-switch-default="">
@@ -113,7 +113,7 @@
         </div>
 
         <!-- Pagination -->
-        <gui-paginator object="this"></gui-paginator>
+        <ot-paginator object="this"></ot-paginator>
 
     </form>
 </section>
diff --git a/src/app/design/directives/validator/between.js b/src/app/core/directives/validator/between.js
similarity index 97%
rename from src/app/design/directives/validator/between.js
rename to src/app/core/directives/validator/between.js
index 6efaad8e..8f8a80b9 100644
--- a/src/app/design/directives/validator/between.js
+++ b/src/app/core/directives/validator/between.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
     .directive("otBetween", function () {
         return {
diff --git a/src/app/design/directives/validator/date.js b/src/app/core/directives/validator/date.js
similarity index 96%
rename from src/app/design/directives/validator/date.js
rename to src/app/core/directives/validator/date.js
index 3911cd4d..ff2cbc23 100644
--- a/src/app/design/directives/validator/date.js
+++ b/src/app/core/directives/validator/date.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otDate", function () {
     return {
diff --git a/src/app/design/directives/validator/email.js b/src/app/core/directives/validator/email.js
similarity index 96%
rename from src/app/design/directives/validator/email.js
rename to src/app/core/directives/validator/email.js
index 64ca2e81..6273e35c 100644
--- a/src/app/design/directives/validator/email.js
+++ b/src/app/core/directives/validator/email.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otEmail", function () {
     return {
diff --git a/src/app/design/directives/validator/len.js b/src/app/core/directives/validator/len.js
similarity index 97%
rename from src/app/design/directives/validator/len.js
rename to src/app/core/directives/validator/len.js
index 55a2189d..61a5c5e5 100644
--- a/src/app/design/directives/validator/len.js
+++ b/src/app/core/directives/validator/len.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otLen", function () {
     return {
diff --git a/src/app/design/directives/validator/match.js b/src/app/core/directives/validator/match.js
similarity index 98%
rename from src/app/design/directives/validator/match.js
rename to src/app/core/directives/validator/match.js
index a4923443..5a38819e 100644
--- a/src/app/design/directives/validator/match.js
+++ b/src/app/core/directives/validator/match.js
@@ -5,7 +5,7 @@
  *  match-caseless
  *  not-match
  */
-angular.module("designModule")
+angular.module("coreModule")
     .directive("otMatch", ['$parse', function($parse) {
         return {
             restrict: 'A',
diff --git a/src/app/design/directives/validator/number.js b/src/app/core/directives/validator/number.js
similarity index 96%
rename from src/app/design/directives/validator/number.js
rename to src/app/core/directives/validator/number.js
index e474203b..a3c28ea3 100644
--- a/src/app/design/directives/validator/number.js
+++ b/src/app/core/directives/validator/number.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otNumber", function () {
     return {
diff --git a/src/app/design/directives/validator/password.js b/src/app/core/directives/validator/password.js
similarity index 98%
rename from src/app/design/directives/validator/password.js
rename to src/app/core/directives/validator/password.js
index e8d4b3ad..8a2b9a19 100644
--- a/src/app/design/directives/validator/password.js
+++ b/src/app/core/directives/validator/password.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otPassword", function() {
     return {
diff --git a/src/app/design/directives/validator/positive.js b/src/app/core/directives/validator/positive.js
similarity index 97%
rename from src/app/design/directives/validator/positive.js
rename to src/app/core/directives/validator/positive.js
index ebc0e416..875908c7 100644
--- a/src/app/design/directives/validator/positive.js
+++ b/src/app/core/directives/validator/positive.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otPositive", function () {
     return {
diff --git a/src/app/design/directives/validator/price.js b/src/app/core/directives/validator/price.js
similarity index 96%
rename from src/app/design/directives/validator/price.js
rename to src/app/core/directives/validator/price.js
index 68c66d88..9c45e09b 100644
--- a/src/app/design/directives/validator/price.js
+++ b/src/app/core/directives/validator/price.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
     .directive("otPrice", function () {
         return {
             restrict: 'A',
diff --git a/src/app/design/directives/validator/regexp.js b/src/app/core/directives/validator/regexp.js
similarity index 97%
rename from src/app/design/directives/validator/regexp.js
rename to src/app/core/directives/validator/regexp.js
index 1688adab..62b8924d 100644
--- a/src/app/design/directives/validator/regexp.js
+++ b/src/app/core/directives/validator/regexp.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otRegexp", function () {
     return {
diff --git a/src/app/design/directives/validator/sku.js b/src/app/core/directives/validator/sku.js
similarity index 97%
rename from src/app/design/directives/validator/sku.js
rename to src/app/core/directives/validator/sku.js
index 4bac9c81..70033436 100644
--- a/src/app/design/directives/validator/sku.js
+++ b/src/app/core/directives/validator/sku.js
@@ -1,4 +1,4 @@
-angular.module("designModule")
+angular.module("coreModule")
 
 .directive("otSku", function () {
     return {
diff --git a/src/app/design/image.service.js b/src/app/core/image.service.js
similarity index 81%
rename from src/app/design/image.service.js
rename to src/app/core/image.service.js
index 17b00d06..a0e82a63 100644
--- a/src/app/design/image.service.js
+++ b/src/app/core/image.service.js
@@ -1,6 +1,6 @@
-angular.module('designModule')
+angular.module('coreModule')
 
-.factory('designImageService', [
+.factory('coreImageService', [
     'MEDIA_BASE_PATH',
     function (MEDIA_BASE_PATH) {
 
diff --git a/src/app/design/init.js b/src/app/core/init.js
similarity index 86%
rename from src/app/design/init.js
rename to src/app/core/init.js
index 8c5d7d62..46b66b5a 100644
--- a/src/app/design/init.js
+++ b/src/app/core/init.js
@@ -1,4 +1,4 @@
-angular.module('designModule',[])
+angular.module('coreModule',[])
 
 .constant('MEDIA_BASE_PATH', angular.appConfigValue('general.app.media_path'))
 .constant('PRODUCT_DEFAULT_IMG', 'placeholder.png')
diff --git a/src/app/dashboard/controllers.js b/src/app/dashboard/controller.js
similarity index 98%
rename from src/app/dashboard/controllers.js
rename to src/app/dashboard/controller.js
index 8f8bc435..2a9afa7a 100644
--- a/src/app/dashboard/controllers.js
+++ b/src/app/dashboard/controller.js
@@ -4,7 +4,7 @@ angular.module("dashboardModule")
     "$scope",
     "$location",
     "dashboardStatisticService",
-    "designImageService",
+    "coreImageService",
     "dashboardUtilsService",
     "$timeout",
     "moment",
@@ -12,7 +12,7 @@ angular.module("dashboardModule")
         $scope,
         $location,
         $statistic,
-        designImageService,
+        coreImageService,
         dashboardUtilsService,
         $timeout,
         moment
@@ -177,7 +177,7 @@ angular.module("dashboardModule")
 
         //TODO: delete this when images are attached to products
         function getProductImage(image) {
-            return designImageService.getImage(image);
+            return coreImageService.getImage(image);
         };
 
     }
diff --git a/src/app/dashboard/init.js b/src/app/dashboard/init.js
index cf491b33..f4e98d26 100644
--- a/src/app/dashboard/init.js
+++ b/src/app/dashboard/init.js
@@ -13,7 +13,7 @@ angular.module('dashboardModule', [
     'categoryModule',
     'cmsModule',
     'configModule',
-    'designModule',
+    'coreModule',
     'discountsModule',
     'impexModule',
     'loginModule',
diff --git a/src/app/discounts/service/api.js b/src/app/discounts/api.service.js
similarity index 100%
rename from src/app/discounts/service/api.js
rename to src/app/discounts/api.service.js
diff --git a/src/app/discounts/controller/edit.js b/src/app/discounts/edit.controller.js
similarity index 100%
rename from src/app/discounts/controller/edit.js
rename to src/app/discounts/edit.controller.js
diff --git a/src/app/discounts/edit.html b/src/app/discounts/edit.html
index 668ca6e7..7b12bc7a 100644
--- a/src/app/discounts/edit.html
+++ b/src/app/discounts/edit.html
@@ -127,11 +127,11 @@ <h2>Conditions</h2>
                     </a>
                 </label>
                 <div class="form-group">
-                    <gui-product-selector
+                    <ot-product-selector
                         editor-scope="{Attribute:'product_in_cart'}"
                         item="discount.limits"
                         parent="{}">
-                    </gui-product-selector>
+                    </ot-product-selector>
                 </div>
             </div>
         </div>
@@ -151,11 +151,11 @@ <h2>Target Criteria</h2>
                         </a>
                     </label>
                     <div class="form-group">
-                        <gui-product-selector
+                        <ot-product-selector
                             editor-scope="{Attribute:'target_line_items'}"
                             item="discount"
                             parent="{}">
-                        </gui-product-selector>
+                        </ot-product-selector>
                     </div>
                 </div>
             </div>
diff --git a/src/app/discounts/init.js b/src/app/discounts/init.js
index 92aa3e1c..5f509a21 100644
--- a/src/app/discounts/init.js
+++ b/src/app/discounts/init.js
@@ -1,7 +1,7 @@
 /**
  * Discounts Module
  */
-angular.module('discountsModule', ['ngRoute', 'designModule'])
+angular.module('discountsModule', ['ngRoute', 'coreModule'])
 
 .config([
     '$routeProvider',
diff --git a/src/app/discounts/controller/list.js b/src/app/discounts/list.controller.js
similarity index 100%
rename from src/app/discounts/controller/list.js
rename to src/app/discounts/list.controller.js
diff --git a/src/app/impex/service/api.js b/src/app/impex/api.service.js
similarity index 100%
rename from src/app/impex/service/api.js
rename to src/app/impex/api.service.js
diff --git a/src/app/impex/init.js b/src/app/impex/init.js
index 02c17aa3..162414bf 100644
--- a/src/app/impex/init.js
+++ b/src/app/impex/init.js
@@ -1,4 +1,4 @@
-angular.module("impexModule", ["ngRoute", "ngResource"])
+angular.module("impexModule", ["ngRoute", "ngResource", "coreModule"])
 
 /*
  *  Basic routing configuration
diff --git a/src/app/impex/main.html b/src/app/impex/main.html
index fee9ce1f..78c6b47c 100644
--- a/src/app/impex/main.html
+++ b/src/app/impex/main.html
@@ -9,7 +9,7 @@ <h1>
 
     <!-- Error message -->
     <div class="col-xs-12">
-        <gui-message-manager item="message"></gui-message-manager>
+        <ot-message-manager item="message"></ot-message-manager>
     </div>
 
     <!-- Import Status Progressbar -->
@@ -29,14 +29,14 @@ <h1>
             ng-class="{ 'has-error': importMethod && !file }">
             <label for="file">File</label>
             <div class="input-group">
-                <gui-input-file
+                <ot-input-file
                     class="form-control"
                     file="file"
                     input-id="'file'"
                     input-name="'file'">
 
                     {{ (file && file.name) ? file.name : 'Choose file' }}
-                </gui-input-file>
+                </ot-input-file>
                 <div class="input-group-btn">
                     <button class="btn btn-primary" ng-click="import('batch')">Import csv script</button>
                 </div>
diff --git a/src/app/login/service/api.js b/src/app/login/api.service.js
similarity index 100%
rename from src/app/login/service/api.js
rename to src/app/login/api.service.js
diff --git a/src/app/login/init.js b/src/app/login/init.js
index cfdf7779..6d5f6c7d 100644
--- a/src/app/login/init.js
+++ b/src/app/login/init.js
@@ -1,4 +1,4 @@
-angular.module("loginModule", ["ngRoute", "ngResource"])
+angular.module("loginModule", ["ngRoute", "ngResource", "coreModule"])
 
 /**
 *  Basic routing configuration
diff --git a/src/app/login/controller/login.js b/src/app/login/login.controller.js
similarity index 100%
rename from src/app/login/controller/login.js
rename to src/app/login/login.controller.js
diff --git a/src/app/login/login.html b/src/app/login/login.html
index 2daee8b3..ca41855f 100644
--- a/src/app/login/login.html
+++ b/src/app/login/login.html
@@ -21,7 +21,7 @@ <h2 class="text-center">Login</h2>
             <hr>
 
             <!-- Error message -->
-            <gui-message-manager item="message"></gui-message-manager>
+            <ot-message-manager item="message"></ot-message-manager>
 
             <!-- Login -->
             <div class="form-group">
diff --git a/src/app/login/service/login.js b/src/app/login/login.service.js
similarity index 100%
rename from src/app/login/service/login.js
rename to src/app/login/login.service.js
diff --git a/src/app/login/controller/logout.js b/src/app/login/logout.controller.js
similarity index 100%
rename from src/app/login/controller/logout.js
rename to src/app/login/logout.controller.js
diff --git a/src/app/order/edit.html b/src/app/order/edit.html
index fd74fe40..8afbed4b 100644
--- a/src/app/order/edit.html
+++ b/src/app/order/edit.html
@@ -18,7 +18,7 @@ <h1 ng-if="!order._id">
 
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 
 <div class="row">
diff --git a/src/app/order/init.js b/src/app/order/init.js
index 55c45737..c2bb5355 100644
--- a/src/app/order/init.js
+++ b/src/app/order/init.js
@@ -1,7 +1,7 @@
 angular.module("orderModule", [
     "ngRoute",
     "ngResource",
-    "designModule",
+    "coreModule",
     "cmsModule"
 ])
 
diff --git a/src/app/order/list.html b/src/app/order/list.html
index 0e561acd..2d907ae7 100644
--- a/src/app/order/list.html
+++ b/src/app/order/list.html
@@ -43,7 +43,7 @@ <h1>
 </div>
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <ul class="nav nav-tabs m-b">
     <li ng-class="{active: tabs.isActive('processed')}">
@@ -75,11 +75,11 @@ <h1>
 </ul>
 
 <!-- Order Reesults -->
-<gui-table-manager
+<ot-table-manager
     items="orders"
     object="this"
     buttons="{'new':false,'delete':false}">
-</gui-table-manager>
+</ot-table-manager>
 
 <div ng-show="!orders.length"
     class="text-center">
diff --git a/src/app/product/controller/attributeEdit.js b/src/app/product/attribute/edit.controller.js
similarity index 100%
rename from src/app/product/controller/attributeEdit.js
rename to src/app/product/attribute/edit.controller.js
diff --git a/src/app/product/attribute/edit.html b/src/app/product/attribute/edit.html
index 92ed09fc..75c50489 100644
--- a/src/app/product/attribute/edit.html
+++ b/src/app/product/attribute/edit.html
@@ -12,7 +12,7 @@ <h1 ng-if="!attribute.Attribute">
 
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <br>
 
@@ -63,7 +63,7 @@ <h1 ng-if="!attribute.Attribute">
                        ng-model="attribute.Options"/>
            </div>
            <div class="col-sm-3">
-               <gui-json-editor data="attribute.Options" ng-if="isEditOptions"></gui-json-editor>
+               <ot-json-editor data="attribute.Options" ng-if="isEditOptions"></ot-json-editor>
            </div>
        </div>
     </div>
diff --git a/src/app/product/controller/attributeList.js b/src/app/product/attribute/list.controller.js
similarity index 100%
rename from src/app/product/controller/attributeList.js
rename to src/app/product/attribute/list.controller.js
diff --git a/src/app/product/attribute/list.html b/src/app/product/attribute/list.html
index d191b2f8..97e69ac5 100644
--- a/src/app/product/attribute/list.html
+++ b/src/app/product/attribute/list.html
@@ -4,5 +4,5 @@ <h1><i class="fa fa-tags"></i> Product Attributes</h1>
 
 <div class="col-xs-12">
 	<!-- Table -->
-	<gui-table-manager items="attributesList" object="this" mapping="{'id': 'Attribute', 'name': 'Label', 'shortDesc': 'name'}"></gui-table-manager>
+	<ot-table-manager items="attributesList" object="this" mapping="{'id': 'Attribute', 'name': 'Label', 'shortDesc': 'name'}"></ot-table-manager>
 </div>
\ No newline at end of file
diff --git a/src/app/product/directive/guiCustomOptionsManager.js b/src/app/product/directive/ot-custom-options-manager.directive.js
similarity index 98%
rename from src/app/product/directive/guiCustomOptionsManager.js
rename to src/app/product/directive/ot-custom-options-manager.directive.js
index 9adfdbe1..8e606faf 100644
--- a/src/app/product/directive/guiCustomOptionsManager.js
+++ b/src/app/product/directive/ot-custom-options-manager.directive.js
@@ -1,6 +1,6 @@
 angular.module("productModule")
 
-.directive("guiCustomOptionsManager", [function () {
+.directive("otCustomOptionsManager", [function () {
     return {
         restrict: "E",
         scope: {
@@ -8,7 +8,7 @@ angular.module("productModule")
             "attribute": "=editorScope",
             "item": "=item"
         },
-        templateUrl: "/views/product/gui/custom_options_manager.html",
+        templateUrl: "/views/product/directive/ot-custom-options-manager.html",
         controller: function ($scope) {
             var isInit, initData, modifyData, normalizeJSON, getOptions, getOptionLength, cloneRow;
 
diff --git a/src/app/product/gui/custom_options_manager.html b/src/app/product/directive/ot-custom-options-manager.html
similarity index 100%
rename from src/app/product/gui/custom_options_manager.html
rename to src/app/product/directive/ot-custom-options-manager.html
diff --git a/src/app/product/controller/edit.js b/src/app/product/edit.controller.js
similarity index 98%
rename from src/app/product/controller/edit.js
rename to src/app/product/edit.controller.js
index b4717301..1718c9be 100644
--- a/src/app/product/controller/edit.js
+++ b/src/app/product/edit.controller.js
@@ -6,9 +6,9 @@ angular.module("productModule")
 "$location",
 "$q",
 "productApiService",
-"designImageService",
+"coreImageService",
 "dashboardUtilsService",
-function ($scope, $routeParams, $location, $q, productApiService, designImageService, dashboardUtilsService) {
+function ($scope, $routeParams, $location, $q, productApiService, coreImageService, dashboardUtilsService) {
 
     var productId, getDefaultProduct, addImageManagerAttribute, addStockValues;
 
@@ -287,6 +287,6 @@ function ($scope, $routeParams, $location, $q, productApiService, designImageSer
      * @returns {string}        - full path to image
      */
     $scope.getImage = function (image) {
-        return designImageService.getImage(image);
+        return coreImageService.getImage(image);
     };
 }]);
diff --git a/src/app/product/edit.html b/src/app/product/edit.html
index dcd3b1cf..5c2d7177 100644
--- a/src/app/product/edit.html
+++ b/src/app/product/edit.html
@@ -10,7 +10,7 @@ <h1 ng-if="!product._id">
 </div>
 
 <!-- Error mesage -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Tabs editor -->
-<gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="product"></gui-attributes-editor-form-tabs>
+<ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="product"></ot-attributes-editor-form-tabs>
diff --git a/src/app/product/init.js b/src/app/product/init.js
index 9b4d9acf..b1196f78 100644
--- a/src/app/product/init.js
+++ b/src/app/product/init.js
@@ -1,7 +1,7 @@
 /**
  * Products Modules
  */
-angular.module('productModule', ['ngRoute', 'ngResource', 'designModule'])
+angular.module('productModule', ['ngRoute', 'ngResource', 'coreModule'])
 
 .config(['$routeProvider', function ($routeProvider) {
     $routeProvider
diff --git a/src/app/product/controller/list.js b/src/app/product/list.controller.js
similarity index 100%
rename from src/app/product/controller/list.js
rename to src/app/product/list.controller.js
diff --git a/src/app/product/list.html b/src/app/product/list.html
index 863a4bd0..dab44df9 100644
--- a/src/app/product/list.html
+++ b/src/app/product/list.html
@@ -8,8 +8,8 @@ <h1>
 <div class="col-sm-12">
 
 	<!-- Error message -->
-	<gui-message-manager item="message"></gui-message-manager>
+	<ot-message-manager item="message"></ot-message-manager>
 
 	<!-- Table -->
-	<gui-table-manager items="products" object="this"></gui-table-manager>
+	<ot-table-manager items="products" object="this"></ot-table-manager>
 </div>
diff --git a/src/app/reports/init.js b/src/app/reports/init.js
index 859f9b36..93e57b80 100644
--- a/src/app/reports/init.js
+++ b/src/app/reports/init.js
@@ -1,15 +1,15 @@
 angular.module('reportsModule', [
     'ngRoute',
     'ngResource',
-    'designModule',
+    'coreModule',
     'configModule',
 ])
 
-.config(["$routeProvider", function($routeProvider) {
+.config(['$routeProvider', function($routeProvider) {
     $routeProvider
-        .when("/reports/product", {
-            templateUrl: "/views/reports/product.html",
-            controller: "reportsProductController"
+        .when('/reports/product', {
+            templateUrl: '/views/reports/product.html',
+            controller: 'reportsProductController'
         });
 }]);
 
diff --git a/src/app/reports/product.js b/src/app/reports/product.controller.js
similarity index 93%
rename from src/app/reports/product.js
rename to src/app/reports/product.controller.js
index d46702ba..d6badd37 100644
--- a/src/app/reports/product.js
+++ b/src/app/reports/product.controller.js
@@ -73,8 +73,8 @@ angular.module('reportsModule')
                 tooltip: {
                     formatter: function() {
                         return [
-                            this.series.name,': ',
-                            '<b>$',this.y,'</b>'
+                            this.series.name , ': ' ,
+                            '<b>' , this.point.units_sold , ' units @ $' ,  this.y , '</b>'
                         ].join('');
                     }
                 }
@@ -122,7 +122,7 @@ angular.module('reportsModule')
                 return {
                     // sku, units_sold
                     name: product.name,
-                    data: [product.gross_sales]
+                    data: [{y: product.gross_sales, units_sold: product.units_sold}]
                 };
             }
         }
diff --git a/src/app/reports/product.html b/src/app/reports/product.html
index 73178716..61e53996 100644
--- a/src/app/reports/product.html
+++ b/src/app/reports/product.html
@@ -23,6 +23,8 @@ <h1>
     </h1>
 </div>
 
+<highchart config="chartConfig"></highchart>
+
 <table class="table table-hover">
     <thead>
         <tr>
diff --git a/src/app/seo/service/api.js b/src/app/seo/api.service.js
similarity index 100%
rename from src/app/seo/service/api.js
rename to src/app/seo/api.service.js
diff --git a/src/app/seo/controller/editSeo.js b/src/app/seo/edit.controller.js
similarity index 100%
rename from src/app/seo/controller/editSeo.js
rename to src/app/seo/edit.controller.js
diff --git a/src/app/seo/edit.html b/src/app/seo/edit.html
index 3296e125..2f89d1bb 100644
--- a/src/app/seo/edit.html
+++ b/src/app/seo/edit.html
@@ -12,8 +12,8 @@ <h1 ng-if="!seo._id">
 <div class="col-xs-12">
 
 	<!-- Error message -->
-    <gui-message-manager item="message"></gui-message-manager>
+    <ot-message-manager item="message"></ot-message-manager>
 
     <!-- Tabs editor -->
-    <gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="seo"></gui-attributes-editor-form-tabs>
+    <ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="seo"></ot-attributes-editor-form-tabs>
 </div>
diff --git a/src/app/seo/controller/edit.js b/src/app/seo/independent-edit.controller.js
similarity index 100%
rename from src/app/seo/controller/edit.js
rename to src/app/seo/independent-edit.controller.js
diff --git a/src/app/seo/init.js b/src/app/seo/init.js
index 76bbcaf5..b882b197 100644
--- a/src/app/seo/init.js
+++ b/src/app/seo/init.js
@@ -1,4 +1,4 @@
-angular.module("seoModule", ["ngRoute", "ngResource"])
+angular.module("seoModule", ["ngRoute", "ngResource", "coreModule"])
 
 .config(["$routeProvider", function ($routeProvider) {
     $routeProvider
diff --git a/src/app/seo/controller/list.js b/src/app/seo/list.controller.js
similarity index 100%
rename from src/app/seo/controller/list.js
rename to src/app/seo/list.controller.js
diff --git a/src/app/seo/list.html b/src/app/seo/list.html
index 13ac01bc..138e389c 100644
--- a/src/app/seo/list.html
+++ b/src/app/seo/list.html
@@ -7,7 +7,7 @@ <h1>
 
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Table -->
-<gui-table-manager items="rewrites" object="this"></gui-table-manager>
+<ot-table-manager items="rewrites" object="this"></ot-table-manager>
diff --git a/src/app/seo/service/seo.js b/src/app/seo/seo.service.js
similarity index 100%
rename from src/app/seo/service/seo.js
rename to src/app/seo/seo.service.js
diff --git a/src/app/subscriptions/service/api.js b/src/app/subscriptions/api.service.js
similarity index 100%
rename from src/app/subscriptions/service/api.js
rename to src/app/subscriptions/api.service.js
diff --git a/src/app/subscriptions/controller/edit.js b/src/app/subscriptions/edit.controller.js
similarity index 100%
rename from src/app/subscriptions/controller/edit.js
rename to src/app/subscriptions/edit.controller.js
diff --git a/src/app/subscriptions/edit.html b/src/app/subscriptions/edit.html
index 4a065de2..93ec8ec1 100644
--- a/src/app/subscriptions/edit.html
+++ b/src/app/subscriptions/edit.html
@@ -9,7 +9,7 @@ <h1>
     </h1>
 </div>
 
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <div class="row">
     <div class="col-sm-8">
diff --git a/src/app/subscriptions/init.js b/src/app/subscriptions/init.js
index a2c1d449..4a5e3ab8 100644
--- a/src/app/subscriptions/init.js
+++ b/src/app/subscriptions/init.js
@@ -1,7 +1,7 @@
 angular.module("subscriptionsModule", [
     "ngRoute",
     "ngResource",
-    "designModule",
+    "coreModule",
 ])
 
 .config(["$routeProvider", function ($routeProvider) {
diff --git a/src/app/subscriptions/controller/list.js b/src/app/subscriptions/list.controller.js
similarity index 100%
rename from src/app/subscriptions/controller/list.js
rename to src/app/subscriptions/list.controller.js
diff --git a/src/app/subscriptions/list.html b/src/app/subscriptions/list.html
index 8478c257..7e129c1b 100644
--- a/src/app/subscriptions/list.html
+++ b/src/app/subscriptions/list.html
@@ -6,11 +6,11 @@ <h1>
 </div>
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Table -->
-<gui-table-manager object="this"
+<ot-table-manager object="this"
     items="subscriptions"
     buttons="{'new':false,'delete':false}">
-</gui-table-manager>
+</ot-table-manager>
 
diff --git a/src/app/visitor/controller/addressEdit.js b/src/app/visitor/address/edit.controller.js
similarity index 100%
rename from src/app/visitor/controller/addressEdit.js
rename to src/app/visitor/address/edit.controller.js
diff --git a/src/app/visitor/address/edit.html b/src/app/visitor/address/edit.html
index 0089d62a..a9e99f3d 100644
--- a/src/app/visitor/address/edit.html
+++ b/src/app/visitor/address/edit.html
@@ -4,10 +4,10 @@ <h2 class="text-center" ng-if="!address._id"> New address </h2>
 
 <div class="col-xs-12">
 	<!-- Error message -->
-    <gui-message-manager item="message"></gui-message-manager>
+    <ot-message-manager item="message"></ot-message-manager>
 
     <!-- Tabs editor -->
-    <gui-attributes-editor-form-tabs attributes-list="attributes" object="this" item="address"></gui-attributes-editor-form-tabs>
+    <ot-attributes-editor-form-tabs attributes-list="attributes" object="this" item="address"></ot-attributes-editor-form-tabs>
 </div>
 <br><br>
 <div class="text-center">
diff --git a/src/app/visitor/controller/addressList.js b/src/app/visitor/address/list.controller.js
similarity index 100%
rename from src/app/visitor/controller/addressList.js
rename to src/app/visitor/address/list.controller.js
diff --git a/src/app/visitor/address/list.html b/src/app/visitor/address/list.html
index 0af9eead..80df85f6 100644
--- a/src/app/visitor/address/list.html
+++ b/src/app/visitor/address/list.html
@@ -3,10 +3,10 @@ <h2 class="text-center">Addresses</h2>
 
 <div class="col-xs-12">
 	<!-- Error-message -->
-	<gui-message-manager item="message"></gui-message-manager>
+	<ot-message-manager item="message"></ot-message-manager>
 
 	<!-- Table -->
-    <gui-table-manager items="addresses" object="this"></gui-table-manager>
+    <ot-table-manager items="addresses" object="this"></ot-table-manager>
 </div>
 
 <div class="text-center">
diff --git a/src/app/visitor/controller/attributeEdit.js b/src/app/visitor/attribute/edit.controller.js
similarity index 100%
rename from src/app/visitor/controller/attributeEdit.js
rename to src/app/visitor/attribute/edit.controller.js
diff --git a/src/app/visitor/attribute/edit.html b/src/app/visitor/attribute/edit.html
index 6ed9973f..89c0061a 100644
--- a/src/app/visitor/attribute/edit.html
+++ b/src/app/visitor/attribute/edit.html
@@ -11,7 +11,7 @@ <h1 ng-if="!attribute.Attribute">
 </div>
 
 <!-- Error message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <br>
 
@@ -51,7 +51,7 @@ <h1 ng-if="!attribute.Attribute">
                 data-ng-model="attribute.Editors"
                 data-ng-options="choice for choice in editorsList">
         </select>
-        <gui-json-editor data="attribute.Options" ng-if="isEditOptions"></gui-json-editor>
+        <ot-json-editor data="attribute.Options" ng-if="isEditOptions"></ot-json-editor>
     </div>
     <div class="col-xs-12 col-sm-6 form-group ">
         <label for="inpOptions">Options</label>
diff --git a/src/app/visitor/controller/attributeList.js b/src/app/visitor/attribute/list.controller.js
similarity index 100%
rename from src/app/visitor/controller/attributeList.js
rename to src/app/visitor/attribute/list.controller.js
diff --git a/src/app/visitor/attribute/list.html b/src/app/visitor/attribute/list.html
index 773f7f90..8120b1c0 100644
--- a/src/app/visitor/attribute/list.html
+++ b/src/app/visitor/attribute/list.html
@@ -7,5 +7,5 @@ <h1>
 
 <div class="col-xs-12 attr-table">
 	<!-- Table -->
-	<gui-table-manager items="attributesList" object="this" mapping="{'id': 'Attribute', 'name': 'Label', 'shortDesc': 'name'}"></gui-table-manager>
+	<ot-table-manager items="attributesList" object="this" mapping="{'id': 'Attribute', 'name': 'Label', 'shortDesc': 'name'}"></ot-table-manager>
 </div>
\ No newline at end of file
diff --git a/src/app/visitor/controller/visitorEdit.js b/src/app/visitor/edit.controller.js
similarity index 100%
rename from src/app/visitor/controller/visitorEdit.js
rename to src/app/visitor/edit.controller.js
diff --git a/src/app/visitor/edit.html b/src/app/visitor/edit.html
index a998c8fc..a45d30c7 100644
--- a/src/app/visitor/edit.html
+++ b/src/app/visitor/edit.html
@@ -10,12 +10,12 @@ <h1 ng-if="!visitor._id">
 </div>
 
 <!-- Message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Atributes -->
-<gui-attributes-editor-form-tabs attributes-list="attributes"
+<ot-attributes-editor-form-tabs attributes-list="attributes"
     object="this"
-    item="visitor"></gui-attributes-editor-form-tabs>
+    item="visitor"></ot-attributes-editor-form-tabs>
 
 <br>
 
diff --git a/src/app/visitor/controller/visitorEmail.js b/src/app/visitor/email.controller.js
similarity index 100%
rename from src/app/visitor/controller/visitorEmail.js
rename to src/app/visitor/email.controller.js
diff --git a/src/app/visitor/send-email.html b/src/app/visitor/email.html
similarity index 64%
rename from src/app/visitor/send-email.html
rename to src/app/visitor/email.html
index 0e05f997..a1cf4897 100644
--- a/src/app/visitor/send-email.html
+++ b/src/app/visitor/email.html
@@ -8,10 +8,10 @@ <h1>
 <div class="animated fadeIn">
 
 	<!-- Message -->
-	<gui-message-manager item="message"></gui-message-manager>
+	<ot-message-manager item="message"></ot-message-manager>
 
 	<!-- Sending form -->
-	<gui-form-builder attributes="attributes" item="email"></gui-form-builder>
+	<ot-form-builder attributes="attributes" item="email"></ot-form-builder>
 
 	<br>
 
diff --git a/src/app/visitor/init.js b/src/app/visitor/init.js
index e938fd81..317e0dce 100644
--- a/src/app/visitor/init.js
+++ b/src/app/visitor/init.js
@@ -4,7 +4,7 @@
 angular.module('visitorModule', [
     'ngRoute',
     'ngResource',
-    'designModule'
+    'coreModule'
 ])
 
 .config([
@@ -36,7 +36,7 @@ angular.module('visitorModule', [
                 controller: 'visitorAttributeEditController'
             })
             .when('/emails', {
-                templateUrl: '/views/visitor/send-email.html',
+                templateUrl: '/views/visitor/email.html',
                 controller: 'visitorEmailController'
             });
     }]
diff --git a/src/app/visitor/controller/visitorList.js b/src/app/visitor/list.controller.js
similarity index 100%
rename from src/app/visitor/controller/visitorList.js
rename to src/app/visitor/list.controller.js
diff --git a/src/app/visitor/list.html b/src/app/visitor/list.html
index 9a4a090f..61756108 100644
--- a/src/app/visitor/list.html
+++ b/src/app/visitor/list.html
@@ -7,7 +7,7 @@ <h1>
 
 
 <!-- Message -->
-<gui-message-manager item="message"></gui-message-manager>
+<ot-message-manager item="message"></ot-message-manager>
 
 <!-- Table -->
-<gui-table-manager items="visitors" object="this"></gui-table-manager>
+<ot-table-manager items="visitors" object="this"></ot-table-manager>