From b3d8187421b4ee96b7fbdf472b98591756dedebc Mon Sep 17 00:00:00 2001
From: basicprimitives <info@BasicPrimitives.com>
Date: Wed, 16 Dec 2020 00:05:46 -0500
Subject: [PATCH] Added tree shaking support for core library

---
 client/package.json                           |    4 +-
 .../src/components/Options/CheckboxOption.js  |    4 +-
 .../src/components/Options/ComboBoxOption.js  |    4 +-
 .../components/Options/ItemsOrderOption.js    |    6 +-
 .../components/Options/RadioGroupOption.js    |    4 +-
 client/src/components/Options/SizeOption.js   |   10 +-
 client/src/components/Options/TextOption.js   |    4 +-
 .../src/components/Options/ThicknessOption.js |   10 +-
 client/src/components/Options/options.js      |  106 +-
 .../PdfViewDialog/FamPdfViewDialog.js         |    4 +-
 .../PdfViewDialog/OrgPdfViewDialog.js         |    4 +-
 .../components/PdfViewDialog/PdfViewDialog.js |    4 +-
 client/src/containers/App/AppDrawer.js        |    6 +-
 client/src/containers/App/helpers.js          |   17 +-
 .../CrossTeamGroup/CrossTeamGroup.js          |    6 +-
 .../containers/Dependencies/Dependencies.js   |   18 +-
 .../DynamicLoading/DynamicLoading.js          |    6 +-
 .../FamilyChartItemsOrdering.js               |   10 +-
 .../FamilyChartWithAnnotations.js             |   10 +-
 .../FinancialOwnership/FinancialOwnership.js  |   20 +-
 .../HighlightAnnotations.js                   |    8 +-
 .../LargeHierarchy/LargeHierarchy.js          |    6 +-
 client/src/containers/License/License.js      |    4 +-
 .../MutualFinancialOwnership.js               |   18 +-
 .../containers/OrgEditor/AddNewItemDialog.js  |   12 +-
 .../OrgEditor/NodeDragDropSource.js           |    4 +-
 client/src/containers/OrgEditor/OrgEditor.js  |    6 +-
 .../OrgEditor/SelectCursorItemDialog.js       |   10 +-
 client/src/containers/Partners/Partners.js    |    6 +-
 client/src/containers/Patents/Patents.js      |   18 +-
 .../containers/ReactUseCases/LiveEditor.js    |    6 +-
 .../containers/ReactUseCases/ReactHowToUse.js |    8 +-
 client/src/containers/TechTree/TechTree.js    |   22 +-
 client/src/containers/UseCases/Editor.js      |    6 +-
 client/src/containers/UseCases/HowToUse.js    |    2 +-
 .../VerticalLayout/VerticalLayout.js          |    8 +-
 .../src/redux/modules/demos/crossteamgroup.js |   86 +-
 .../src/redux/modules/demos/dependencies.js   |  137 +-
 .../src/redux/modules/demos/dynamicloading.js |   86 +-
 .../modules/demos/familychartitemsordering.js |  126 +-
 .../demos/familychartwithannotations.js       |  114 +-
 .../redux/modules/demos/financialownership.js |  140 +-
 .../modules/demos/highlightannotations.js     |   45 +-
 .../modules/demos/largeorganizationalchart.js |   29 +-
 .../modules/demos/mutualfinancialownership.js |  132 +-
 client/src/redux/modules/demos/orgeditor.js   |   81 +-
 client/src/redux/modules/demos/partners.js    |   84 +-
 client/src/redux/modules/demos/patents.js     |  140 +-
 client/src/redux/modules/demos/techtree.js    |  128 +-
 .../verticallayoutorganizationalchart.js      |   94 +-
 client/src/redux/modules/pages.js             |    2 +-
 client/yarn.lock                              | 1099 +++---
 server/package.json                           |    2 +-
 .../demofamilycharts/data/alignmentData.js    |   19 +-
 .../demofamilycharts/data/crossShape.js       |   19 +-
 .../demofamilycharts/data/famSpouses.js       |   19 +-
 .../services/demofamilycharts/data/famdata.js |   43 +-
 .../demofamilycharts/data/famdata2.js         |   19 +-
 .../demofamilycharts/data/famdataCascade.js   |   19 +-
 .../demofamilycharts/data/famdataCharless2.js |   21 +-
 .../demofamilycharts/data/famdataLoops.js     |   35 +-
 .../demofamilycharts/data/famdataLoopsTest.js |    6 +-
 .../demofamilycharts/data/famdataOwnership.js |   63 +-
 .../demofamilycharts/data/famdataWorld.js     |   21 +-
 .../demofamilycharts/data/familyOrdering.js   |   92 +-
 .../data/financialOwnership.js                |   72 +-
 .../demofamilycharts/data/horizontalChain.js  |   19 +-
 .../demofamilycharts/data/matrixLayout.js     |   19 +-
 .../data/mutualFinancialOwnership.js          |   48 +-
 .../demofamilycharts/data/rombusShape.js      |   21 +-
 .../demofamilycharts/data/sandClockShape.js   |   21 +-
 .../demofamilycharts/data/sideBySide.js       |   21 +-
 .../demofamilycharts/data/skippedMembers.js   |   19 +-
 .../demofamilycharts/data/techTree.js         |   42 +-
 .../data/largeorganizationalchart.js          |    4 +-
 .../data/matrixlayout.js                      | 3368 ++++++++---------
 .../demoorganizationalcharts/data/partners.js |  162 +-
 .../data/smalldataset.js                      |  134 +-
 .../data/verticallayoutorganizationalchart.js |   40 +-
 server/src/services/howtouse/index.js         |    5 +-
 server/src/services/howtouse/markdown.js      |    8 +-
 server/src/static/downloads.md                |   23 +-
 server/src/static/javascript                  |    2 +-
 server/yarn.lock                              |  103 +-
 84 files changed, 3693 insertions(+), 3740 deletions(-)

diff --git a/client/package.json b/client/package.json
index 6647ba3..159ba7b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -15,8 +15,8 @@
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
     "axios": "^0.21.0",
-    "basicprimitives": "^5.9.2",
-    "basicprimitivesreact": "^5.9.3",
+    "basicprimitives": "^6.0.3",
+    "basicprimitivesreact": "^6.0.3",
     "blob-stream": "^0.1.3",
     "clsx": "^1.1.1",
     "codemirror": "^5.58.2",
diff --git a/client/src/components/Options/CheckboxOption.js b/client/src/components/Options/CheckboxOption.js
index f853b21..2f5489c 100644
--- a/client/src/components/Options/CheckboxOption.js
+++ b/client/src/components/Options/CheckboxOption.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import _ from 'lodash';
+import { isEqual } from 'lodash';
 import PropTypes from 'prop-types';
 import Checkbox from '@material-ui/core/Checkbox';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
@@ -17,7 +17,7 @@ class CheckboxOption extends Component { // eslint-disable-line react/prefer-sta
     const nextOptions = this.getUsedOptions(nextProps);
     const currentOptions = this.getUsedOptions(this.props);
 
-    return !_.isEqual(currentOptions, nextOptions);
+    return !isEqual(currentOptions, nextOptions);
   }
 
   getUsedOptions(props) { // eslint-disable-line class-methods-use-this
diff --git a/client/src/components/Options/ComboBoxOption.js b/client/src/components/Options/ComboBoxOption.js
index 5a0c5d8..6b72ba3 100644
--- a/client/src/components/Options/ComboBoxOption.js
+++ b/client/src/components/Options/ComboBoxOption.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import _ from 'lodash';
+import { isEqual } from 'lodash';
 import PropTypes from 'prop-types';
 import FormLabel from '@material-ui/core/FormLabel';
 import MenuItem from '@material-ui/core/MenuItem';
@@ -34,7 +34,7 @@ class ComboBoxOption extends Component {
     const nextOptions = this.getUsedOptions(nextProps);
     const currentOptions = this.getUsedOptions(this.props);
 
-    return !_.isEqual(currentOptions, nextOptions);
+    return !isEqual(currentOptions, nextOptions);
   }
 
   getValue(value) {
diff --git a/client/src/components/Options/ItemsOrderOption.js b/client/src/components/Options/ItemsOrderOption.js
index 4929cde..18e6621 100644
--- a/client/src/components/Options/ItemsOrderOption.js
+++ b/client/src/components/Options/ItemsOrderOption.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import _ from 'lodash';
+import { isEqual } from 'lodash';
 import { SortableContainer, SortableElement, arrayMove } from 'react-sortable-hoc';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
@@ -45,7 +45,7 @@ class ItemsOrderOption extends Component {
 
   componentWillReceiveProps({ items: newItems }) {
     const { items } = this.state;
-    if (!_.isEqual(newItems, items)) {
+    if (!isEqual(newItems, items)) {
       this.setState({
         items: newItems
       });
@@ -56,7 +56,7 @@ class ItemsOrderOption extends Component {
     // eslint-disable-line no-unused-vars
     const { items } = this.state;
     const { items: newItems } = nextState;
-    return !_.isEqual(items, newItems);
+    return !isEqual(items, newItems);
   }
 
   onSortEnd({ oldIndex, newIndex }) {
diff --git a/client/src/components/Options/RadioGroupOption.js b/client/src/components/Options/RadioGroupOption.js
index fc78634..6d93641 100644
--- a/client/src/components/Options/RadioGroupOption.js
+++ b/client/src/components/Options/RadioGroupOption.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import _ from 'lodash';
+import { isEqual } from 'lodash';
 import PropTypes from 'prop-types';
 import Radio from '@material-ui/core/Radio';
 import RadioGroup from '@material-ui/core/RadioGroup';
@@ -29,7 +29,7 @@ class RadioGroupOption extends Component {
     const nextOptions = this.getUsedOptions(nextProps);
     const currentOptions = this.getUsedOptions(this.props);
 
-    return !_.isEqual(currentOptions, nextOptions);
+    return !isEqual(currentOptions, nextOptions);
   }
 
   getValue(value) {
diff --git a/client/src/components/Options/SizeOption.js b/client/src/components/Options/SizeOption.js
index 1602461..857bce9 100644
--- a/client/src/components/Options/SizeOption.js
+++ b/client/src/components/Options/SizeOption.js
@@ -1,11 +1,11 @@
 import React, { Component } from 'react';
-import _ from 'lodash';
+import { isEqual } from 'lodash';
 import PropTypes from 'prop-types';
 import FormLabel from '@material-ui/core/FormLabel';
 import MenuItem from '@material-ui/core/MenuItem';
 import FormControl from '@material-ui/core/FormControl';
 import Select from '@material-ui/core/Select';
-import primitives from 'basicprimitives';
+import { Size } from 'basicprimitives';
 import Tooltip from '@material-ui/core/Tooltip';
 
 class SizeOption extends Component {
@@ -25,17 +25,17 @@ class SizeOption extends Component {
     const nextOptions = this.getUsedOptions(nextProps);
     const currentOptions = this.getUsedOptions(this.props);
 
-    return !_.isEqual(currentOptions, nextOptions);
+    return !isEqual(currentOptions, nextOptions);
   }
 
   onWidthChange(width) {
     const { onChange, value } = this.props;
-    onChange(new primitives.common.Size(width, value.height));
+    onChange(new Size(width, value.height));
   }
 
   onHeightChange(height) {
     const { onChange, value } = this.props;
-    onChange(new primitives.common.Size(value.width, height));
+    onChange(new Size(value.width, height));
   }
 
   getUsedOptions(props) { // eslint-disable-line class-methods-use-this
diff --git a/client/src/components/Options/TextOption.js b/client/src/components/Options/TextOption.js
index b2cfb07..e3daa58 100644
--- a/client/src/components/Options/TextOption.js
+++ b/client/src/components/Options/TextOption.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import _ from 'lodash';
+import { isEqual } from 'lodash';
 import PropTypes from 'prop-types';
 import TextField from '@material-ui/core/TextField';
 
@@ -56,7 +56,7 @@ class TextOption extends Component { // eslint-disable-line react/prefer-statele
     const currentOptions = this.getUsedOptions(this.props);
     const { value } = this.state;
     const { newValue } = nextState;
-    return !(_.isEqual(currentOptions, nextOptions) && value === newValue);
+    return !(isEqual(currentOptions, nextOptions) && value === newValue);
   }
 
   onTimer() {
diff --git a/client/src/components/Options/ThicknessOption.js b/client/src/components/Options/ThicknessOption.js
index 65cce43..0d87972 100644
--- a/client/src/components/Options/ThicknessOption.js
+++ b/client/src/components/Options/ThicknessOption.js
@@ -1,12 +1,12 @@
 import React, { Component } from 'react';
-import _ from 'lodash';
+import { isEqual, startCase, camelCase } from 'lodash';
 import PropTypes from 'prop-types';
 import FormLabel from '@material-ui/core/FormLabel';
 import MenuItem from '@material-ui/core/MenuItem';
 import FormControl from '@material-ui/core/FormControl';
 import Select from '@material-ui/core/Select';
 import Tooltip from '@material-ui/core/Tooltip';
-import primitives from 'basicprimitives';
+import { Thickness } from 'basicprimitives';
 
 class ThicknessOption extends Component {
   static propTypes = {
@@ -26,12 +26,12 @@ class ThicknessOption extends Component {
     const nextOptions = this.getUsedOptions(nextProps);
     const currentOptions = this.getUsedOptions(this.props);
 
-    return !_.isEqual(currentOptions, nextOptions);
+    return !isEqual(currentOptions, nextOptions);
   }
 
   onPropertyChange(propertyName, propertyValue) {
     const { onChange, value } = this.props;
-    const result = new primitives.common.Thickness(value);
+    const result = new Thickness(value);
     result[propertyName] = propertyValue;
     onChange(result);
   }
@@ -58,7 +58,7 @@ class ThicknessOption extends Component {
         </Tooltip>
         {names.map(name => {
           return <FormControl className={'option-panel-item'} key={`${propertyName}-${name}`}>
-            <FormLabel key={`${propertyName}-${name}-label`} id={`${propertyName}-${name}-label`}>{_.startCase(_.camelCase(name))}</FormLabel>
+            <FormLabel key={`${propertyName}-${name}-label`} id={`${propertyName}-${name}-label`}>{startCase(camelCase(name))}</FormLabel>
             <Select
               labelId={`${propertyName}-${name}-label`}
               key={`${propertyName}-${name}`}
diff --git a/client/src/components/Options/options.js b/client/src/components/Options/options.js
index a9a6bbc..a9d2e6c 100644
--- a/client/src/components/Options/options.js
+++ b/client/src/components/Options/options.js
@@ -1,4 +1,8 @@
-import primitives from 'basicprimitives';
+import {AdviserPlacementType,  ChildrenPlacementType,  Colors, ConnectorLabelPlacementType, ConnectorPlacementType,
+    ConnectorShapeType, ConnectorType, ElbowType, Enabled, GraphicsType, GroupByType, HorizontalAlignmentType,
+    LineType, LoopsLayoutMode, NavigationMode, NeighboursSelectionMode, OrientationType, PlacementType, SelectionPathMode,
+    ShapeType, TextOrientationType, VerticalAlignmentType, Visibility, ZOrderType
+} from 'basicprimitives';
 import { phone, email } from 'utils/validation';
 
 const images = 'abcdefghijklmnopqrstuvwxyz'.split('').reduce((agg, imageChar) => {
@@ -12,16 +16,16 @@ const AutoLayoutOptions = {
     options: [
         { optionType: "CaptionConfig", caption: "Page Fit Mode defines rule of fitting chart into available screen space. Set it to None if you want to disable it." },
         { optionType: "RadioBoxConfig", name: "pageFitMode", caption: "Page Fit Mode", options: { None: 0, PageWidth: 1, PageHeight: 2, FitToPage: 3, SelectionOnly: 6 }, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "orientationType",  caption: "Orientation Type", options: primitives.common.OrientationType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "verticalAlignment",  caption: "Items Vertical Alignment", options: primitives.common.VerticalAlignmentType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "horizontalAlignment",  caption: "Items Horizontal Alignment", options: primitives.common.HorizontalAlignmentType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "childrenPlacementType",  caption: "Children placement", options: primitives.common.ChildrenPlacementType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "leavesPlacementType",  caption: "Leaves placement defines layout shape for items having no children", options: primitives.common.ChildrenPlacementType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "orientationType",  caption: "Orientation Type", options: OrientationType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "verticalAlignment",  caption: "Items Vertical Alignment", options: VerticalAlignmentType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "horizontalAlignment",  caption: "Items Horizontal Alignment", options: HorizontalAlignmentType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "childrenPlacementType",  caption: "Children placement", options: ChildrenPlacementType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "leavesPlacementType",  caption: "Leaves placement defines layout shape for items having no children", options: ChildrenPlacementType, valueType: "number" },
         { optionType: "CheckBoxConfig", name: "placeAdvisersAboveChildren",  caption: "Place children of advisers above their parent node children" },
         { optionType: "CheckBoxConfig", name: "placeAssistantsAboveChildren",  caption: "Place children of assistants above their parent node children" },
         { optionType: "DropDownBoxConfig", name: "maximumColumnsInMatrix", caption: "Maximum columns number in matrix children layout", options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20], valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "minimalVisibility", caption: "Minimal nodes visibility", options: primitives.common.Visibility, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "selectionPathMode", caption: "Selection Path Mode sets visibility of items between cursor item and root", options: primitives.common.SelectionPathMode, valueType: "number" }
+        { optionType: "RadioBoxConfig", name: "minimalVisibility", caption: "Minimal nodes visibility", options: Visibility, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "selectionPathMode", caption: "Selection Path Mode sets visibility of items between cursor item and root", options: SelectionPathMode, valueType: "number" }
     ]
 };
 
@@ -31,12 +35,12 @@ const FamilyLayoutOptions = {
     options: [
         { optionType: "CaptionConfig", caption: "Page Fit Mode defines rule of fitting chart into available screen space. Set it to None if you want to disable it." },
         { optionType: "RadioBoxConfig", name: "pageFitMode", caption: "Page Fit Mode", options: { None: 0, PageWidth: 1, PageHeight: 2, FitToPage: 3, SelectionOnly: 6 }, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "orientationType",  caption: "Orientation Type", options: primitives.common.OrientationType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "verticalAlignment",  caption: "Items Vertical Alignment", options: primitives.common.VerticalAlignmentType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "orientationType",  caption: "Orientation Type", options: OrientationType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "verticalAlignment",  caption: "Items Vertical Alignment", options: VerticalAlignmentType, valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "maximumColumnsInMatrix", caption: "Maximum columns number in matrix children layout", options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20], valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "minimalVisibility", caption: "Minimal nodes visibility", options: primitives.common.Visibility, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "neighboursSelectionMode", caption: "Neighbours Selection Mode", options: primitives.common.NeighboursSelectionMode, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "selectionPathMode", caption: "Selection Path Mode sets visibility of items between cursor item and root", options: primitives.common.SelectionPathMode, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "minimalVisibility", caption: "Minimal nodes visibility", options: Visibility, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "neighboursSelectionMode", caption: "Neighbours Selection Mode", options: NeighboursSelectionMode, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "selectionPathMode", caption: "Selection Path Mode sets visibility of items between cursor item and root", options: SelectionPathMode, valueType: "number" },
         { optionType: "CaptionConfig", caption: "Group by option defines node placement in layout close to its parents or children when node is linked across multiple levels in hierarchy. See `alignment` data set." },
         { optionType: "RadioBoxConfig", name: "groupByType", caption: "Group By", options: { Children: 2, Parents: 1 }, valueType: "number" },
         { optionType: "CaptionConfig", caption: "The following option keeps items at the same levels after connections bundling." },
@@ -44,7 +48,7 @@ const FamilyLayoutOptions = {
         { optionType: "CaptionConfig", caption: "The following option hides direct connectors to grand parents. It helps reduce diagrams connectors layout complexity. This option should be used together with dynamic highlighting of connectors to grandparents via immidiate parents, so information is not lost." },
         { optionType: "CheckBoxConfig", name: "hideGrandParentsConnectors",  caption: "Hides grand parents connectors" },
         { optionType: "CaptionConfig", caption: "Chart optimizes items placement into layers, so the final diagram has minimal number of feedback loops between them. Use following option to disable that behaviour and place items in the same sequence as in source items collection." },
-        { optionType: "RadioBoxConfig", name: "loopsLayoutMode", caption: "Loops Layout Mode", options: primitives.common.LoopsLayoutMode, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "loopsLayoutMode", caption: "Loops Layout Mode", options: LoopsLayoutMode, valueType: "number" },
         { optionType: "CaptionConfig", caption: "The following option enables natrix layout in family diagram. Nodes having the same set of parents and children are grouped into square shaped matrix in order to keep them visualy together." },
         { optionType: "CheckBoxConfig", name: "enableMatrixLayout",  caption: "Enable Matrix Layout" },
         { optionType: "DropDownBoxConfig", name: "minimumMatrixSize", caption: "Minimum number of nodes needed in order to be formed into matrix layout", options: [2, 3, 4, 5, 6, 7, 8, 9, 10], valueType: "number", isNullable: true },
@@ -56,12 +60,12 @@ const DefaultTemplateOptions = {
     title: "Default Template", 
     namespace: "config",
     options: [
-        { optionType: "RadioBoxConfig", name: "hasButtons", caption: "Show user buttons", options: primitives.common.Enabled, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "hasSelectorCheckbox", caption: "Show selection check box", options: primitives.common.Enabled, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "hasButtons", caption: "Show user buttons", options: Enabled, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "hasSelectorCheckbox", caption: "Show selection check box", options: Enabled, valueType: "number" },
         { optionType: "TextConfig", name: "selectCheckBoxLabel", caption: "Selection checkbox label", valueType: "string", isNullable: false },
         { optionType: "CaptionConfig", name: "Default chart item template tries to select the best matching font color for current title background." },
-        { optionType: "DropDownBoxConfig", name: "itemTitleFirstFontColor", caption: "Title first font color", options: primitives.common.Colors, valueType: "string" },
-        { optionType: "DropDownBoxConfig", name: "itemTitleSecondFontColor", caption: "Title second font color", options: primitives.common.Colors, valueType: "string" },
+        { optionType: "DropDownBoxConfig", name: "itemTitleFirstFontColor", caption: "Title first font color", options: Colors, valueType: "string" },
+        { optionType: "DropDownBoxConfig", name: "itemTitleSecondFontColor", caption: "Title second font color", options: Colors, valueType: "string" },
         { optionType: "DropDownBoxConfig", name: "buttonsPanelSize", caption: "Buttons panel size", options: [28, 56, 84], valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "checkBoxPanelSize", caption: "Checkbox panel size", options: [24, 48, 72], valueType: "number" }
     ]
@@ -70,12 +74,12 @@ const GroupTitlesOptions = {
     title: "Group Titles", 
     namespace: "config",
     options: [
-        { optionType: "RadioBoxConfig", name: "groupTitlePlacementType", caption: "Placement", options: primitives.common.AdviserPlacementType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "groupTitlePlacementType", caption: "Placement", options: AdviserPlacementType, valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "groupTitlePanelSize", caption: "Group title panel width", options: [24, 48, 72], valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "groupTitleOrientation", caption: "Orientation", options: primitives.text.TextOrientationType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "groupTitleVerticalAlignment", caption: "Vertical Alignment", options: primitives.common.VerticalAlignmentType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "groupTitleHorizontalAlignment", caption: "Horizontal Alignment", options: primitives.common.HorizontalAlignmentType, valueType: "number" },
-        { optionType: "DropDownBoxConfig", name: "groupTitleColor", caption: "Background Color", options: primitives.common.Colors, valueType: "string" },
+        { optionType: "RadioBoxConfig", name: "groupTitleOrientation", caption: "Orientation", options: TextOrientationType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "groupTitleVerticalAlignment", caption: "Vertical Alignment", options: VerticalAlignmentType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "groupTitleHorizontalAlignment", caption: "Horizontal Alignment", options: HorizontalAlignmentType, valueType: "number" },
+        { optionType: "DropDownBoxConfig", name: "groupTitleColor", caption: "Background Color", options: Colors, valueType: "string" },
         { optionType: "CaptionConfig", caption: "For group title color, see title first and second font colors in default template options." },
         { optionType: "DropDownBoxConfig", name: "groupTitleFontSize", caption: "Font size", options: ["8px", "10px", "12px", "14px", "16px", "18px", "20px"], valueType: "string" },
         { optionType: "DropDownBoxConfig", name: "groupTitleFontWeight", caption: "Font Weight", options: ["normal", "bold"], valueType: "string" },
@@ -92,12 +96,12 @@ const MarkersOptions = {
         { optionType: "SizeConfig", name: "minimizedItemSize", caption: "Marker size", widths: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 16, 18, 20, 30, 40], heights: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 16, 18, 20, 30, 40] },
         { optionType: "DropDownBoxConfig", name: "minimizedItemCornerRadius", caption: "Corner Radius", options: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20], valueType: "number", isNullable: true },
         { optionType: "ThicknessConfig", name: "highlightPadding", caption: "Highlight border padding around marker", options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] },
-        { optionType: "RadioBoxConfig", name: "minimizedItemShapeType", caption: "Marker Shape", options: primitives.common.ShapeType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "minimizedItemShapeType", caption: "Marker Shape", options: ShapeType, valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "minimizedItemLineWidth", caption: "Marker border line width", options: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "minimizedItemLineType", caption: "Marker border line type", options: primitives.common.LineType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "minimizedItemLineType", caption: "Marker border line type", options: LineType, valueType: "number" },
         { optionType: "CaptionConfig", caption: "Following Border and Fill colors properties work only for items having no title color property set. See Parners & Annotations Demo to try them." },
-        { optionType: "DropDownBoxConfig", name: "minimizedItemBorderColor", caption: "Marker border line color", options: primitives.common.Colors, valueType: "string", isNullable: true },
-        { optionType: "DropDownBoxConfig", name: "minimizedItemFillColor", caption: "Marker fill color", options: primitives.common.Colors, valueType: "string", isNullable: true },
+        { optionType: "DropDownBoxConfig", name: "minimizedItemBorderColor", caption: "Marker border line color", options: Colors, valueType: "string", isNullable: true },
+        { optionType: "DropDownBoxConfig", name: "minimizedItemFillColor", caption: "Marker fill color", options: Colors, valueType: "string", isNullable: true },
         { optionType: "DropDownBoxConfig", name: "minimizedItemOpacity", caption: "Opacity", options: [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0], valueType: "number" }
     ]
 };
@@ -122,13 +126,13 @@ const ConnectorsOptions = {
     title: "Connectors", 
     namespace: "config",
     options: [
-        { optionType: "RadioBoxConfig", name: "arrowsDirection", caption: "Arrows Direction", options: primitives.common.GroupByType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "connectorType", caption: "Connectors", options: primitives.common.ConnectorType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "elbowType", caption: "Elbows Type", options: primitives.common.ElbowType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "arrowsDirection", caption: "Arrows Direction", options: GroupByType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "connectorType", caption: "Connectors", options: ConnectorType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "elbowType", caption: "Elbows Type", options: ElbowType, valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "bevelSize", caption: "Bevel Size", options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "elbowDotSize", caption: "Elbow dot Size", options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "linesType", caption: "Line type", options: primitives.common.LineType, valueType: "number" },
-        { optionType: "DropDownBoxConfig", name: "linesColor", caption: "Color", options: primitives.common.Colors, valueType: "string" },
+        { optionType: "RadioBoxConfig", name: "linesType", caption: "Line type", options: LineType, valueType: "number" },
+        { optionType: "DropDownBoxConfig", name: "linesColor", caption: "Color", options: Colors, valueType: "string" },
         { optionType: "DropDownBoxConfig", name: "linesWidth", caption: "Line width", options: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], valueType: "number" },
         { optionType: "CheckBoxConfig", name: "showExtraArrows", caption: "Show extra horizontal arrows on top of connectors, for easy navigation between parents and children through connector lines" },
         { optionType: "DropDownBoxConfig", name: "extraArrowsMinimumSpace", caption: "Available minimum space to show horizontal arrow", options: [0, 5, 10, 20, 30, 40, 50, 100, 200, 1000], valueType: "number" }
@@ -139,14 +143,14 @@ const LabelsOptions = {
     namespace: "config",
     options: [
         { optionType: "CaptionConfig", caption: "Label property should be defined for every item first, otherwise chart has nothiong to show. Labels are visible only for markers. If you need to add labels to normal size items you have to modify default item template and place text outside item boundaries." },
-        { optionType: "RadioBoxConfig", name: "showLabels", caption: "Show labels", options: primitives.common.Enabled, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "showLabels", caption: "Show labels", options: Enabled, valueType: "number" },
         { optionType: "SizeConfig", name: "labelSize", caption: "Size: Use this property to define labels bounding rectangle. Labels placed relative to markers(dots), so if they overlap each other in auto show mode, one of them would be hidden. Set appropriate intervals between levels of markers in order to fit and make all labels visible.", widths: [80, 160, 240, 320], heights: [8, 16, 24, 32, 40, 48, 56] },
         { optionType: "DropDownBoxConfig", name: "labelOffset", caption: "Offset", options: [0, 1, 2, 3, 4, 5, 10, 20, 30], valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "labelOrientation", caption: "Label Orientation", options: primitives.text.TextOrientationType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "labelPlacement", caption: "Label Placement", options: primitives.common.PlacementType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "labelOrientation", caption: "Label Orientation", options: TextOrientationType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "labelPlacement", caption: "Label Placement", options: PlacementType, valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "labelFontSize", caption: "Font size", options: ["8px", "10px", "12px", "14px", "16px", "18px", "20px"], valueType: "string" },
         { optionType: "DropDownBoxConfig", name: "labelFontFamily", caption: "Font Style", options: ["Arial", "Verdana", "Times New Roman", "Serif", "Courier"], valueType: "string" },
-        { optionType: "DropDownBoxConfig", name: "labelColor", caption: "Font Color", options: primitives.common.Colors, valueType: "string" },
+        { optionType: "DropDownBoxConfig", name: "labelColor", caption: "Font Color", options: Colors, valueType: "string" },
         { optionType: "DropDownBoxConfig", name: "labelFontWeight", caption: "Font Weight", options: ["normal", "bold"], valueType: "string" },
         { optionType: "DropDownBoxConfig", name: "labelFontStyle", caption: "Font Style", options: ["normal", "italic"], valueType: "string" },
     ]
@@ -159,8 +163,8 @@ const CalloutOptions = {
         { optionType: "CheckBoxConfig", name: "showCallout", caption: "Show callout" },
         { optionType: "RadioBoxConfig", name: "calloutMaximumVisibility", caption: "Maximum node type visibility", options: { Normal: 1, Dot: 2, Line: 3 }, valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "calloutPlacementOffset", caption: "Call out placement offset", options: [10, 20, 30, 40, 50, 100, 200, 300], valueType: "number" },
-        { optionType: "DropDownBoxConfig", name: "calloutfillColor", caption: "Fill color", options: primitives.common.Colors, valueType: "string" },
-        { optionType: "DropDownBoxConfig", name: "calloutBorderColor", caption: "Border line color", options: primitives.common.Colors, valueType: "string", isNullable: true },
+        { optionType: "DropDownBoxConfig", name: "calloutfillColor", caption: "Fill color", options: Colors, valueType: "string" },
+        { optionType: "DropDownBoxConfig", name: "calloutBorderColor", caption: "Border line color", options: Colors, valueType: "string", isNullable: true },
         { optionType: "DropDownBoxConfig", name: "calloutOffset", caption: "Offset", options: [0, 1, 2, 3, 4, 5, 10, 20, 30], valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "calloutCornerRadius", caption: "Corner Radius", options: ["0%", "5%", "10%", "20%", 0, 1, 2, 3, 4, 5, 10, 20, 30], valueType: "string" },
         { optionType: "DropDownBoxConfig", name: "calloutPointerWidth", caption: "Pointer Base Width", options: ["0%", "5%", "10%", "20%", 0, 5, 10, 20, 50], valueType: "string" },
@@ -173,7 +177,7 @@ const InteractivityOptions = {
     namespace: "config",
     options: [
         { optionType: "CaptionConfig", caption: "Use this option to disable mouse highlight on touch devices." },
-        { optionType: "RadioBoxConfig", name: "navigationMode", caption: "Navigation mode", options: primitives.common.NavigationMode, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "navigationMode", caption: "Navigation mode", options: NavigationMode, valueType: "number" },
         { optionType: "CaptionConfig", caption: "This option defines highlight gravity radius, so minimized item gets highlighted when mouse pointer does not overlap marker but it is within gravity radius of its boundaries." },
         { optionType: "DropDownBoxConfig", name: "highlightGravityRadius", caption: "Normal", options: [0, 5, 10, 20, 30, 40, 50, 100, 200, 1000], valueType: "number" },
         { optionType: "CheckBoxConfig", name: "enablePanning", caption: "Enable Panning" }
@@ -184,7 +188,7 @@ const RenderingOptions = {
     namespace: "config",
     options: [
         { optionType: "CaptionConfig", caption: "By default widget preferes SVG graphics mode. Use this property to enforce graphics mode programmatically." },
-        { optionType: "RadioBoxConfig", name: "graphicsType", caption: "Graphics", options: primitives.common.GraphicsType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "graphicsType", caption: "Graphics", options: GraphicsType, valueType: "number" },
         { optionType: "CaptionConfig", caption: "In order to achive better greacefull degradation of your diagram use item templates of various sizes instead of CSS scale." },
         { optionType: "DropDownBoxConfig", name: "scale", caption: "CSS Scale", options: { "50%": 0.5, "60%": 0.6, "70%": 0.7, "80%": 0.8, "90%": 0.9, "100%": 1.0, "110%": 1.1, "120%": 1.2, "130%": 1.3, "140%": 1.4, "150%": 1.5, "160%": 1.6, "170%": 1.7, "180%": 1.8, "190%": 1.9, "200%": 2.0 }, valueType: "number" },
     ]
@@ -210,10 +214,10 @@ const ItemOptions = {
         { optionType: "TextConfig", name: "phone", caption: "Phone", placeholder: "(123) 123-12-12", onValidate: (value) => phone(value), valueType: "string", isNullable: true },
         { optionType: "TextConfig", name: "email", caption: "E-mail", placeholder: "name@server.com", onValidate: (value) => email(value), valueType: "string", isNullable: true },
         { optionType: "TextConfig", name: "label", caption: "Marker Label", isNullable: true, valueType: "string" },
-        { optionType: "DropDownBoxConfig", name: "itemTitleColor", caption: "Title Color", options: primitives.common.Colors, valueType: "string", isNullable: true },
-        { optionType: "DropDownBoxConfig", name: "groupTitleColor", caption: "Group Title Color", options: primitives.common.Colors, valueType: "string", isNullable: true },
+        { optionType: "DropDownBoxConfig", name: "itemTitleColor", caption: "Title Color", options: Colors, valueType: "string", isNullable: true },
+        { optionType: "DropDownBoxConfig", name: "groupTitleColor", caption: "Group Title Color", options: Colors, valueType: "string", isNullable: true },
         { optionType: "DropDownBoxConfig", name: "image", caption: "Image", options: images, valueType: "string", isNullable: true },
-        { optionType: "DropDownBoxConfig", name: "minimizedItemShapeType", caption: "Marker Shape", options: primitives.common.ShapeType, valueType: "string", isNullable: true },
+        { optionType: "DropDownBoxConfig", name: "minimizedItemShapeType", caption: "Marker Shape", options: ShapeType, valueType: "string", isNullable: true },
     ]
 };
 
@@ -221,14 +225,14 @@ const ConnectorAnnotationOptions = {
     title: "Connector Annotation", 
     namespace: "annotation",
     options: [
-        { optionType: "RadioBoxConfig", name: "connectorPlacementType", caption: "Placement", options: primitives.common.ConnectorPlacementType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "connectorShapeType", caption: "Shape", options: primitives.common.ConnectorShapeType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "labelPlacementType", caption: "Label Placement", options: primitives.common.ConnectorLabelPlacementType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "connectorPlacementType", caption: "Placement", options: ConnectorPlacementType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "connectorShapeType", caption: "Shape", options: ConnectorShapeType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "labelPlacementType", caption: "Label Placement", options: ConnectorLabelPlacementType, valueType: "number" },
         { optionType: "DropDownBoxConfig", name: "lineWidth", caption: "Line width", options: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], valueType: "string" },
-        { optionType: "DropDownBoxConfig", name: "lineType", caption: "Line type", options: primitives.common.LineType, valueType: "string" },
-        { optionType: "DropDownBoxConfig", name: "color", caption: "Color", options: primitives.common.Colors, valueType: "string" },
+        { optionType: "DropDownBoxConfig", name: "lineType", caption: "Line type", options: LineType, valueType: "string" },
+        { optionType: "DropDownBoxConfig", name: "color", caption: "Color", options: Colors, valueType: "string" },
         { optionType: "DropDownBoxConfig", name: "offset", caption: "Offset", options: [-50, -20, -10, -5, 0, 5, 10, 20, 50], valueType: "number" },
-        { optionType: "DropDownBoxConfig", name: "zOrderType", caption: "Connector Z order type", options: primitives.common.ZOrderType, valueType: "number" }
+        { optionType: "DropDownBoxConfig", name: "zOrderType", caption: "Connector Z order type", options: ZOrderType, valueType: "number" }
     ]
 };
 
@@ -246,8 +250,8 @@ const ItemLayoutOptions = {
             LimitedPartner: 7,
             AdviserPartner: 8
           }, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "adviserPlacementType", caption: "Placement", options: primitives.common.AdviserPlacementType, valueType: "number" },
-        { optionType: "RadioBoxConfig", name: "childrenPlacementType", caption: "Children Layout", options: primitives.common.ChildrenPlacementType, valueType: "number" }
+        { optionType: "RadioBoxConfig", name: "adviserPlacementType", caption: "Placement", options: AdviserPlacementType, valueType: "number" },
+        { optionType: "RadioBoxConfig", name: "childrenPlacementType", caption: "Children Layout", options: ChildrenPlacementType, valueType: "number" }
         // { optionType: "CheckBoxConfig", name: "placeAdvisersAboveChildren", caption: "Place advisers above children" },
         // { optionType: "CheckBoxConfig", name: "placeAssistantsAboveChildren", caption: "Place assistants above children" }
     ]
diff --git a/client/src/components/PdfViewDialog/FamPdfViewDialog.js b/client/src/components/PdfViewDialog/FamPdfViewDialog.js
index 70e6c1c..73ce870 100644
--- a/client/src/components/PdfViewDialog/FamPdfViewDialog.js
+++ b/client/src/components/PdfViewDialog/FamPdfViewDialog.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import PdfViewDialog from './PdfViewDialog';
-import primitives from 'basicprimitives';
+import { FamDiagramPdfkit } from 'basicprimitives';
 
 function FamPdfViewDialog(props) {
-    return <PdfViewDialog {...props} plugin={primitives.pdf.famdiagram.Plugin} />
+    return <PdfViewDialog {...props} plugin={FamDiagramPdfkit} />
 }
   
 export default FamPdfViewDialog;
\ No newline at end of file
diff --git a/client/src/components/PdfViewDialog/OrgPdfViewDialog.js b/client/src/components/PdfViewDialog/OrgPdfViewDialog.js
index 6aa81b0..09a34c5 100644
--- a/client/src/components/PdfViewDialog/OrgPdfViewDialog.js
+++ b/client/src/components/PdfViewDialog/OrgPdfViewDialog.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import PdfViewDialog from './PdfViewDialog';
-import primitives from 'basicprimitives';
+import { OrgDiagramPdfkit } from 'basicprimitives';
 
 function OrgPdfViewDialog(props) {
-    return <PdfViewDialog {...props} plugin={primitives.pdf.orgdiagram.Plugin} />
+    return <PdfViewDialog {...props} plugin={OrgDiagramPdfkit} />
 }
   
 export default OrgPdfViewDialog;
\ No newline at end of file
diff --git a/client/src/components/PdfViewDialog/PdfViewDialog.js b/client/src/components/PdfViewDialog/PdfViewDialog.js
index 2360234..d9c959f 100644
--- a/client/src/components/PdfViewDialog/PdfViewDialog.js
+++ b/client/src/components/PdfViewDialog/PdfViewDialog.js
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import primitives from 'basicprimitives';
+import { Enabled } from 'basicprimitives';
 import ReactGA from "react-ga";
 import PDFDocument from 'pdfkit-nodejs-webpack';
 import blobStream from 'blob-stream';
@@ -43,7 +43,7 @@ function PdfViewDialog(props) {
       ...config,
       items,
       cursorItem: null,
-      hasSelectorCheckbox: primitives.common.Enabled.False,
+      hasSelectorCheckbox: Enabled.False,
       templates: (templates || []),
       onItemRender
     });
diff --git a/client/src/containers/App/AppDrawer.js b/client/src/containers/App/AppDrawer.js
index 21f2644..39dfcb1 100644
--- a/client/src/containers/App/AppDrawer.js
+++ b/client/src/containers/App/AppDrawer.js
@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import { withStyles } from '@material-ui/core/styles';
 import List from '@material-ui/core/List';
 import AppDrawerNavItem from './AppDrawerNavItem';
-import {pageToTitle} from './helpers';
+import { pageToTitle } from './helpers';
 import { useSelector, useDispatch } from 'react-redux';
 import { load } from 'redux/modules/pages';
 import { useLocation } from "@reach/router"
-import primitives from 'basicprimitives';
+import { Tree } from 'basicprimitives';
 
 let savedScrollTop = null;
 
@@ -74,7 +74,7 @@ const styles = (theme) => ({
 });
 
 function getPagesTree(pages) {
-  const tree = primitives.common.tree();
+  const tree = Tree();
   tree.add(null, 0, {});
   let key = 0;
   let depth = 0;
diff --git a/client/src/containers/App/helpers.js b/client/src/containers/App/helpers.js
index cad8cc0..a2f23b9 100644
--- a/client/src/containers/App/helpers.js
+++ b/client/src/containers/App/helpers.js
@@ -1,7 +1,6 @@
-const upperFirst = require('lodash/upperFirst');
-const camelCase = require('lodash/camelCase');
+import { upperFirst, camelCase } from 'lodash';
 
-function titleize(string) {
+export function titleize(string) {
   if (process.env.NODE_ENV !== 'production') {
     if (typeof string !== 'string' || string.length <= 0) {
       console.error('titleize(string) expects a non empty string argument.');
@@ -14,7 +13,7 @@ function titleize(string) {
     .join(' ');
 }
 
-function pageToTitle(page) {
+export function pageToTitle(page) {
   if (page.title === false) {
     return null;
   }
@@ -34,13 +33,7 @@ function pageToTitle(page) {
 }
 
 
-function getCookie(name) {
+export function getCookie(name) {
   const regex = new RegExp(`(?:(?:^|.*;*)${name}*=*([^;]*).*$)|^.*$`);
   return document.cookie.replace(regex, '$1');
-}
-
-module.exports = {
-  titleize,
-  pageToTitle,
-  getCookie
-};
+}
\ No newline at end of file
diff --git a/client/src/containers/CrossTeamGroup/CrossTeamGroup.js b/client/src/containers/CrossTeamGroup/CrossTeamGroup.js
index a1daa0e..2f0ac5f 100644
--- a/client/src/containers/CrossTeamGroup/CrossTeamGroup.js
+++ b/client/src/containers/CrossTeamGroup/CrossTeamGroup.js
@@ -17,7 +17,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { OrgDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { Colors } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -182,7 +182,7 @@ function CrossTeamGroup() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div key="title" className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -197,7 +197,7 @@ function CrossTeamGroup() {
               {
                 ...contactTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.ContactTemplate}>
                     <div key="title" className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.ContactTitle}>{itemConfig.title}</div>
diff --git a/client/src/containers/Dependencies/Dependencies.js b/client/src/containers/Dependencies/Dependencies.js
index a764fc8..f2f321f 100644
--- a/client/src/containers/Dependencies/Dependencies.js
+++ b/client/src/containers/Dependencies/Dependencies.js
@@ -20,7 +20,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { FamDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { ConnectorAnnotationConfig, AnnotationType, TemplateConfig, Size, Thickness, Colors, highestContrast } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -113,7 +113,7 @@ function Dependencies() {
   const snackbarMessage = getActionMessage();
   const templateConfig = config.templates.find(template => template.name === 'defaultTemplate');
   const contactTemplateConfig = config.templates.find(template => template.name === 'contactTemplate');
-  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new primitives.orgdiagram.ConnectorAnnotationConfig({offset: 2});
+  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new ConnectorAnnotationConfig({offset: 2});
   return (
     <>
       <Helmet>
@@ -285,7 +285,7 @@ function Dependencies() {
                   dispatch(setTemplateOption('defaultTemplate', name, value));
                   break;
                 case 'annotation':
-                  dispatch(setAnnotationOption(primitives.common.AnnotationType.Connector, name, value));
+                  dispatch(setAnnotationOption(AnnotationType.Connector, name, value));
                   break;
                 default:
                   dispatch(setConfigOption(name, value)) 
@@ -303,20 +303,20 @@ function Dependencies() {
         onClose= {() => setPdfDialogOpen(false)}
         templates={[
           {
-            ...(new primitives.orgdiagram.TemplateConfig()),
+            ...(new TemplateConfig()),
             name: "defaultTemplate",
             itemTemplate: "Use onItemRener method.",
-            itemSize: new primitives.common.Size(164, 34),
-            highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+            itemSize: new Size(164, 34),
+            highlightPadding: new Thickness(2, 2, 2, 2)
           }
         ]}
         onItemRender={(doc, position, data) => {
           var itemConfig = data.context,
-            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue,
-            color = primitives.common.highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
+            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue,
+            color = highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
   
           if (data.templateName === "defaultTemplate") {
-            var contentSize = new primitives.common.Size(164, 34);
+            var contentSize = new Size(164, 34);
   
             contentSize.width -= 2;
             contentSize.height -= 2;
diff --git a/client/src/containers/DynamicLoading/DynamicLoading.js b/client/src/containers/DynamicLoading/DynamicLoading.js
index 34cfe32..8c2b24e 100644
--- a/client/src/containers/DynamicLoading/DynamicLoading.js
+++ b/client/src/containers/DynamicLoading/DynamicLoading.js
@@ -17,7 +17,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { OrgDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { Colors } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -179,7 +179,7 @@ function DynamicLoading() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -204,7 +204,7 @@ function DynamicLoading() {
               {
                 ...contactTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.ContactTemplate}>
                     <div className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.ContactTitle}>{itemConfig.title}</div>
diff --git a/client/src/containers/FamilyChartItemsOrdering/FamilyChartItemsOrdering.js b/client/src/containers/FamilyChartItemsOrdering/FamilyChartItemsOrdering.js
index 5261220..4c9b672 100644
--- a/client/src/containers/FamilyChartItemsOrdering/FamilyChartItemsOrdering.js
+++ b/client/src/containers/FamilyChartItemsOrdering/FamilyChartItemsOrdering.js
@@ -17,7 +17,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { FamDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { Colors, AnnotationType } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -199,7 +199,7 @@ function FamilyChartItemsOrdering() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -214,7 +214,7 @@ function FamilyChartItemsOrdering() {
               {
                 ...contactTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.ContactTemplate}>
                     <div className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.ContactTitle}>{itemConfig.title}</div>
@@ -231,7 +231,7 @@ function FamilyChartItemsOrdering() {
               {
                 ...miniTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.MiniTemplate}>
                     <div className={styles.MiniTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.MiniTitle}>{itemConfig.title}</div>
@@ -301,7 +301,7 @@ function FamilyChartItemsOrdering() {
                   dispatch(setTemplateOption('defaultTemplate', name, value));
                   break;
                 case 'annotation':
-                  dispatch(setAnnotationOption(primitives.common.AnnotationType.Connector, name, value));
+                  dispatch(setAnnotationOption(AnnotationType.Connector, name, value));
                   break;
                 default:
                   dispatch(setConfigOption(name, value)) 
diff --git a/client/src/containers/FamilyChartWithAnnotations/FamilyChartWithAnnotations.js b/client/src/containers/FamilyChartWithAnnotations/FamilyChartWithAnnotations.js
index 60f39ad..ef0a97f 100644
--- a/client/src/containers/FamilyChartWithAnnotations/FamilyChartWithAnnotations.js
+++ b/client/src/containers/FamilyChartWithAnnotations/FamilyChartWithAnnotations.js
@@ -17,7 +17,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { FamDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { Colors, AnnotationType } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -225,7 +225,7 @@ function FamilyChartWithAnnotations() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -240,7 +240,7 @@ function FamilyChartWithAnnotations() {
               {
                 ...contactTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.ContactTemplate}>
                     <div className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.ContactTitle}>{itemConfig.title}</div>
@@ -257,7 +257,7 @@ function FamilyChartWithAnnotations() {
               {
                 ...miniTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.MiniTemplate}>
                     <div className={styles.MiniTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.MiniTitle}>{itemConfig.title}</div>
@@ -317,7 +317,7 @@ function FamilyChartWithAnnotations() {
                   dispatch(setTemplateOption('defaultTemplate', name, value));
                   break;
                 case 'annotation':
-                  dispatch(setAnnotationOption(primitives.common.AnnotationType.Connector, name, value));
+                  dispatch(setAnnotationOption(AnnotationType.Connector, name, value));
                   break;
                 case 'datasets':
                   dispatch(load(value));
diff --git a/client/src/containers/FinancialOwnership/FinancialOwnership.js b/client/src/containers/FinancialOwnership/FinancialOwnership.js
index 0991224..75682fe 100644
--- a/client/src/containers/FinancialOwnership/FinancialOwnership.js
+++ b/client/src/containers/FinancialOwnership/FinancialOwnership.js
@@ -20,7 +20,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { FamDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { ConnectorAnnotationConfig, AnnotationType, TemplateConfig, Size, Thickness, Colors, highestContrast } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -118,7 +118,7 @@ function FinancialOwnership() {
   const templateConfig = config.templates.find(template => template.name === 'defaultTemplate');
   const shapeTemplateConfig = config.templates.find(template => template.name === 'ShapeTemplate');
   const unitTemplateConfig = config.templates.find(template => template.name === 'unitTemplate');
-  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new primitives.orgdiagram.ConnectorAnnotationConfig({offset: 2});
+  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new ConnectorAnnotationConfig({offset: 2});
   return (
     <>
       <Helmet>
@@ -228,7 +228,7 @@ function FinancialOwnership() {
               {
                 ...unitTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.UnitTemplate}>
                     <div className={styles.UnitTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.UnitTitle}>{itemConfig.title}</div>
@@ -294,7 +294,7 @@ function FinancialOwnership() {
                   dispatch(setTemplateOption('defaultTemplate', name, value));
                   break;
                 case 'annotation':
-                  dispatch(setAnnotationOption(primitives.common.AnnotationType.Connector, name, value));
+                  dispatch(setAnnotationOption(AnnotationType.Connector, name, value));
                   break;
                 default:
                   dispatch(setConfigOption(name, value)) 
@@ -312,20 +312,20 @@ function FinancialOwnership() {
         onClose= {() => setPdfDialogOpen(false)}
         templates={[
           {
-            ...(new primitives.orgdiagram.TemplateConfig()),
+            ...(new TemplateConfig()),
             name: "defaultTemplate",
             itemTemplate: "Use onItemRener method.",
-            itemSize: new primitives.common.Size(100, 60),
-            highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+            itemSize: new Size(100, 60),
+            highlightPadding: new Thickness(2, 2, 2, 2)
           }
         ]}
         onItemRender={(doc, position, data) => {
           var itemConfig = data.context,
-            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue,
-            color = primitives.common.highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
+            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue,
+            color = highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
   
           if (data.templateName === "defaultTemplate") {
-            var contentSize = new primitives.common.Size(100, 60);
+            var contentSize = new Size(100, 60);
   
             contentSize.width -= 2;
             contentSize.height -= 2;
diff --git a/client/src/containers/HighlightAnnotations/HighlightAnnotations.js b/client/src/containers/HighlightAnnotations/HighlightAnnotations.js
index 4072b94..b94e0a4 100644
--- a/client/src/containers/HighlightAnnotations/HighlightAnnotations.js
+++ b/client/src/containers/HighlightAnnotations/HighlightAnnotations.js
@@ -17,7 +17,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { OrgDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { Colors } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -184,7 +184,7 @@ function HighlightAnnotations() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -199,7 +199,7 @@ function HighlightAnnotations() {
               {
                 ...defaultConnectedItemTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -214,7 +214,7 @@ function HighlightAnnotations() {
               {
                 ...contactTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.ContactTemplate}>
                     <div className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.ContactTitle}>{itemConfig.title}</div>
diff --git a/client/src/containers/LargeHierarchy/LargeHierarchy.js b/client/src/containers/LargeHierarchy/LargeHierarchy.js
index 6b58025..677e9fe 100644
--- a/client/src/containers/LargeHierarchy/LargeHierarchy.js
+++ b/client/src/containers/LargeHierarchy/LargeHierarchy.js
@@ -17,7 +17,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { OrgDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { Colors } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -182,7 +182,7 @@ function LargeHierarchy() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div key="title" className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -197,7 +197,7 @@ function LargeHierarchy() {
               {
                 ...contactTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.ContactTemplate}>
                     <div key="title" className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.ContactTitle}>{itemConfig.title}</div>
diff --git a/client/src/containers/License/License.js b/client/src/containers/License/License.js
index b77e414..3336c9c 100644
--- a/client/src/containers/License/License.js
+++ b/client/src/containers/License/License.js
@@ -218,8 +218,8 @@ function License() {
           No. The developer license applies to the seat, not the individual.
         </li>
         <li>
-          What is license type for ASP.NET component and any other demo components based on Basic Primitives Diagram?<br />
-          ASP.NET component uses Basic Primitives Diagram jQuery UI widgets for rendering, so its usage is governed by the same license conditions as Basic Primitives Diagram.
+          What is license type for React component and any other demo components based on Basic Primitives Diagram?<br />
+          React component uses Basic Primitives Diagram for rendering, so its usage is governed by the same license conditions as Basic Primitives Diagram.
         </li>
       </ul>
       <h2>Update policy</h2>
diff --git a/client/src/containers/MutualFinancialOwnership/MutualFinancialOwnership.js b/client/src/containers/MutualFinancialOwnership/MutualFinancialOwnership.js
index 48c2556..ef092a6 100644
--- a/client/src/containers/MutualFinancialOwnership/MutualFinancialOwnership.js
+++ b/client/src/containers/MutualFinancialOwnership/MutualFinancialOwnership.js
@@ -20,7 +20,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { FamDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { ConnectorAnnotationConfig, AnnotationType, TemplateConfig, Size, Thickness, Colors, highestContrast } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -112,7 +112,7 @@ function MutualFinancialOwnership() {
 
   const snackbarMessage = getActionMessage();
   const templateConfig = config.templates.find(template => template.name === 'defaultTemplate');
-  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new primitives.orgdiagram.ConnectorAnnotationConfig({offset: 2});
+  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new ConnectorAnnotationConfig({offset: 2});
   return (
     <>
       <Helmet>
@@ -269,7 +269,7 @@ function MutualFinancialOwnership() {
                   dispatch(setTemplateOption('defaultTemplate', name, value));
                   break;
                 case 'annotation':
-                  dispatch(setAnnotationOption(primitives.common.AnnotationType.Connector, name, value));
+                  dispatch(setAnnotationOption(AnnotationType.Connector, name, value));
                   break;
                 default:
                   dispatch(setConfigOption(name, value)) 
@@ -287,20 +287,20 @@ function MutualFinancialOwnership() {
         onClose= {() => setPdfDialogOpen(false)}
         templates={[
           {
-            ...(new primitives.orgdiagram.TemplateConfig()),
+            ...(new TemplateConfig()),
             name: "defaultTemplate",
             itemTemplate: "Use onItemRener method.",
-            itemSize: new primitives.common.Size(100, 60),
-            highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+            itemSize: new Size(100, 60),
+            highlightPadding: new Thickness(2, 2, 2, 2)
           }
         ]}
         onItemRender={(doc, position, data) => {
           var itemConfig = data.context,
-            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue,
-            color = primitives.common.highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
+            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue,
+            color = highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
   
           if (data.templateName === "defaultTemplate") {
-            var contentSize = new primitives.common.Size(100, 60);
+            var contentSize = new Size(100, 60);
   
             contentSize.width -= 2;
             contentSize.height -= 2;
diff --git a/client/src/containers/OrgEditor/AddNewItemDialog.js b/client/src/containers/OrgEditor/AddNewItemDialog.js
index 7bab722..76a469a 100644
--- a/client/src/containers/OrgEditor/AddNewItemDialog.js
+++ b/client/src/containers/OrgEditor/AddNewItemDialog.js
@@ -14,7 +14,7 @@ import TextFieldAdapter from './FieldAdapters/TextFieldAdapter';
 import ComboBoxFieldAdapter from './FieldAdapters/ComboBoxFieldAdapter';
 import RadioGroupFieldAdapter from './FieldAdapters/RadioGroupFieldAdapter';
 import { Form, Field } from 'react-final-form';
-import primitives from 'basicprimitives';
+import { Colors, ShapeType, AdviserPlacementType, ChildrenPlacementType } from 'basicprimitives';
 import addNewItemDialogValidation from './AddNewItemDialogValidation';
 
 class AddNewItemDialog extends Component {
@@ -86,8 +86,8 @@ class AddNewItemDialog extends Component {
                       <Grid item><Field name="phone" component={TextFieldAdapter} placeholder="(123) 123-12-12" caption="phone" /></Grid>
                       <Grid item><Field name="email" component={TextFieldAdapter} placeholder="E-mail" caption="E-mail" /></Grid>
                       <Grid item><Field name="label" component={TextFieldAdapter} placeholder={values.title || 'Marker Label'} caption="Marker Label" /></Grid>
-                      <Grid item><Field name="itemTitleColor" component={ComboBoxFieldAdapter} caption="Title Color" isNullable valueType="string" items={primitives.common.Colors} /></Grid>
-                      <Grid item><Field name="groupTitleColor" component={ComboBoxFieldAdapter} caption="Group Title Color" isNullable valueType="string" items={primitives.common.Colors} /></Grid>
+                      <Grid item><Field name="itemTitleColor" component={ComboBoxFieldAdapter} caption="Title Color" isNullable valueType="string" items={Colors} /></Grid>
+                      <Grid item><Field name="groupTitleColor" component={ComboBoxFieldAdapter} caption="Group Title Color" isNullable valueType="string" items={Colors} /></Grid>
                       <Grid item><Field name="image" component={ComboBoxFieldAdapter} caption="Image" valueType="string" items={images} /></Grid>
                       <Grid item>
                         <Field
@@ -96,7 +96,7 @@ class AddNewItemDialog extends Component {
                           caption="Marker Shape"
                           valueType="number"
                           isNullable={true}
-                          items={primitives.common.ShapeType}
+                          items={ShapeType}
                         />
                       </Grid>
                     </Grid>
@@ -128,7 +128,7 @@ class AddNewItemDialog extends Component {
                           component={RadioGroupFieldAdapter}
                           caption="Placement"
                           valueType="number"
-                          items={primitives.common.AdviserPlacementType}
+                          items={AdviserPlacementType}
                         />
                       </Grid>
                       <Grid item>
@@ -137,7 +137,7 @@ class AddNewItemDialog extends Component {
                           component={RadioGroupFieldAdapter}
                           caption="Children Layout"
                           valueType="number"
-                          items={primitives.common.ChildrenPlacementType}
+                          items={ChildrenPlacementType}
                         />
                       </Grid>
                     </Grid>
diff --git a/client/src/containers/OrgEditor/NodeDragDropSource.js b/client/src/containers/OrgEditor/NodeDragDropSource.js
index 906fa5e..1a8eeae 100644
--- a/client/src/containers/OrgEditor/NodeDragDropSource.js
+++ b/client/src/containers/OrgEditor/NodeDragDropSource.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useDrag, useDrop } from 'react-dnd'
 import useStyles from  './styles';
-import primitives from 'basicprimitives';
+import { Colors } from 'basicprimitives';
 
 const ItemTypes = {
     NODE: 'node'
@@ -31,7 +31,7 @@ export default function NodeDragDropSource({ itemConfig, canDropItem, onDropItem
             isOverCurrent: monitor.isOver({ shallow: true }),
         }),      
     })
-  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
   const styles = useStyles();
   return (
     <div ref={drop} style = {{width: "100%", height: "100%"}}>
diff --git a/client/src/containers/OrgEditor/OrgEditor.js b/client/src/containers/OrgEditor/OrgEditor.js
index 9603ffa..e6d49f1 100644
--- a/client/src/containers/OrgEditor/OrgEditor.js
+++ b/client/src/containers/OrgEditor/OrgEditor.js
@@ -81,7 +81,7 @@ import SelectCursorItemDialog from './SelectCursorItemDialog';
 import AddNewItemDialog from './AddNewItemDialog';
 import SearchDrawer from './SearchDrawer';
 import NodeDragDropSource from './NodeDragDropSource';
-import primitives from 'basicprimitives';
+import { Tree } from 'basicprimitives';
 
 function OrgEditor() {
   const loaded = useSelector(state => state.orgeditor.loaded); 
@@ -133,7 +133,7 @@ function OrgEditor() {
 
   function getTree(items = []) {
     if(!tree) {
-      tree = primitives.common.tree();
+      tree = Tree();
       for (let index = 0; index < items.length; index += 1) {
         const item = items[index];
         tree.add(item.parent, item.id, item);
@@ -421,7 +421,7 @@ function OrgEditor() {
           />
         </Drawer>
       }
-      {activeDrawer === DrawerNames.Item && <Drawer
+      {activeDrawer === DrawerNames.Item && itemConfig && <Drawer
           key="itemoptions-drawer"
           className={styles.drawer}
           variant="persistent"
diff --git a/client/src/containers/OrgEditor/SelectCursorItemDialog.js b/client/src/containers/OrgEditor/SelectCursorItemDialog.js
index 3e3f628..f2f035f 100644
--- a/client/src/containers/OrgEditor/SelectCursorItemDialog.js
+++ b/client/src/containers/OrgEditor/SelectCursorItemDialog.js
@@ -10,7 +10,7 @@ import Typography from '@material-ui/core/Typography';
 import IconButton from '@material-ui/core/IconButton';
 import CloseIcon from '@material-ui/icons/Close';
 import { OrgDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { Colors, Tree, LCA } from 'basicprimitives';
 
 class SelectCursorItemDialog extends Component {
   // eslint-disable-line react/prefer-stateless-function
@@ -74,7 +74,7 @@ class SelectCursorItemDialog extends Component {
   }
 
   getTree(items = []) { // eslint-disable-line class-methods-use-this
-    const tree = primitives.common.tree();
+    const tree = Tree();
 
     // rebuild tree
     for (let index = 0; index < items.length; index += 1) {
@@ -87,7 +87,7 @@ class SelectCursorItemDialog extends Component {
 
   getDeletedItemsParent(tree, deletedItems, deletedHash) { // eslint-disable-line class-methods-use-this
     let result = null;
-    const lca = primitives.common.LCA(tree);
+    const lca = LCA(tree);
     result = deletedItems.reduce((agg, itemid) => {
       if (agg == null) {
         agg = itemid;
@@ -161,7 +161,7 @@ class SelectCursorItemDialog extends Component {
                     {
                       ...templateConfig,
                       onItemRender: ({ context: itemConfig }) => {
-                        const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                        const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                         return <div className={styles.DefaultTemplate}>
                           <div className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                             <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -176,7 +176,7 @@ class SelectCursorItemDialog extends Component {
                     {
                       ...contactTemplateConfig,
                       onItemRender: ({ context: itemConfig }) => {
-                        const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                        const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                         return <div className={styles.ContactTemplate}>
                           <div className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                             <div className={styles.ContactTitle}>{itemConfig.title}</div>
diff --git a/client/src/containers/Partners/Partners.js b/client/src/containers/Partners/Partners.js
index 902c444..fd6ebf7 100644
--- a/client/src/containers/Partners/Partners.js
+++ b/client/src/containers/Partners/Partners.js
@@ -17,7 +17,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { OrgDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { Colors } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -195,7 +195,7 @@ function Partners() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div key="title" className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -210,7 +210,7 @@ function Partners() {
               {
                 ...contactTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.ContactTemplate}>
                     <div key="title" className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.ContactTitle}>{itemConfig.title}</div>
diff --git a/client/src/containers/Patents/Patents.js b/client/src/containers/Patents/Patents.js
index 0250d7d..2f2d558 100644
--- a/client/src/containers/Patents/Patents.js
+++ b/client/src/containers/Patents/Patents.js
@@ -23,7 +23,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { FamDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { ConnectorAnnotationConfig, AnnotationType, TemplateConfig, Size, Thickness, Colors, highestContrast } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -117,7 +117,7 @@ function Patents() {
   const templateConfig = config.templates.find(template => template.name === 'defaultTemplate');
   const directTemplateConfig = config.templates.find(template => template.name === 'directTemplate');
   const contactTemplateConfig = config.templates.find(template => template.name === 'contactTemplate');
-  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new primitives.orgdiagram.ConnectorAnnotationConfig({offset: 2});
+  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new ConnectorAnnotationConfig({offset: 2});
   return (
     <>
       <Helmet>
@@ -318,7 +318,7 @@ function Patents() {
                   dispatch(setTemplateOption('defaultTemplate', name, value));
                   break;
                 case 'annotation':
-                  dispatch(setAnnotationOption(primitives.common.AnnotationType.Connector, name, value));
+                  dispatch(setAnnotationOption(AnnotationType.Connector, name, value));
                   break;
                 default:
                   dispatch(setConfigOption(name, value)) 
@@ -336,20 +336,20 @@ function Patents() {
         onClose= {() => setPdfDialogOpen(false)}
         templates={[
           {
-            ...(new primitives.orgdiagram.TemplateConfig()),
+            ...(new TemplateConfig()),
             name: "defaultTemplate",
             itemTemplate: "Use onItemRener method.",
-            itemSize: new primitives.common.Size(100, 60),
-            highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+            itemSize: new Size(100, 60),
+            highlightPadding: new Thickness(2, 2, 2, 2)
           }
         ]}
         onItemRender={(doc, position, data) => {
           var itemConfig = data.context,
-            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue,
-            color = primitives.common.highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
+            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue,
+            color = highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
   
           if (data.templateName === "defaultTemplate") {
-            var contentSize = new primitives.common.Size(100, 60);
+            var contentSize = new Size(100, 60);
   
             contentSize.width -= 2;
             contentSize.height -= 2;
diff --git a/client/src/containers/ReactUseCases/LiveEditor.js b/client/src/containers/ReactUseCases/LiveEditor.js
index 883c227..21e77a9 100644
--- a/client/src/containers/ReactUseCases/LiveEditor.js
+++ b/client/src/containers/ReactUseCases/LiveEditor.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { LiveContext } from 'react-live'
 import {UnControlled as CodeMirror} from 'react-codemirror2'
-require('codemirror/lib/codemirror.css');
-require('codemirror/theme/material.css');
-require('codemirror/mode/javascript/javascript');
+import 'codemirror/lib/codemirror.css';
+import 'codemirror/theme/material.css';
+import 'codemirror/mode/javascript/javascript';
 
 export default function LiveEditor(props) {
   return (
diff --git a/client/src/containers/ReactUseCases/ReactHowToUse.js b/client/src/containers/ReactUseCases/ReactHowToUse.js
index e612a90..e7b6621 100644
--- a/client/src/containers/ReactUseCases/ReactHowToUse.js
+++ b/client/src/containers/ReactUseCases/ReactHowToUse.js
@@ -13,12 +13,12 @@ import js from 'react-syntax-highlighter/dist/esm/languages/hljs/javascript';
 import docco from 'react-syntax-highlighter/dist/esm/styles/hljs/docco';
 
 import { faUserPlus, faUserSlash, faCoffee, faSitemap, faUser, faComment, faCog } from '@fortawesome/free-solid-svg-icons'
-import primitives from 'basicprimitives';
+import * as basicprimitives from 'basicprimitives';
 import { OrgDiagram, FamDiagram } from 'basicprimitivesreact';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { DndProvider, useDrag, useDrop, DropTarget, DragSource } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
-require('./global.scss');
+import './global.scss';
 
 SyntaxHighlighter.registerLanguage('javascript', js);
 
@@ -67,7 +67,7 @@ function ReactHowToUse(props) {
           scope={{
             Component,
             Fragment,
-            primitives,
+            ...basicprimitives,
             OrgDiagram,
             FamDiagram,
             DndProvider,
@@ -94,7 +94,7 @@ function ReactHowToUse(props) {
               transformed = transformed.replace(/^export.*$/gm, match => '');
               transformed = transform(transformed, {
                 plugins: [
-                  require("@babel/plugin-syntax-jsx"),
+                  require('@babel/plugin-syntax-jsx'),
                   [
                     require("@babel/plugin-proposal-class-properties"),
                     { loose: true }
diff --git a/client/src/containers/TechTree/TechTree.js b/client/src/containers/TechTree/TechTree.js
index ef277fe..b16b53c 100644
--- a/client/src/containers/TechTree/TechTree.js
+++ b/client/src/containers/TechTree/TechTree.js
@@ -14,7 +14,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { FamDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { ConnectorAnnotationConfig, Colors, AnnotationType, TemplateConfig, Size, Thickness, highestContrast } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -105,7 +105,7 @@ function TechTree() {
   const snackbarMessage = getActionMessage();
   const templateConfig = config.templates.find(template => template.name === 'defaultTemplate');
   const dotTemplateConfig = config.templates.find(template => template.name === 'dot');
-  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new primitives.orgdiagram.ConnectorAnnotationConfig({offset: 2});
+  const annotationConfig = config.annotations.find(annotation => annotation.name === "usercontrolledconnector") || new ConnectorAnnotationConfig({offset: 2});
   return (
     <>
       <Helmet>
@@ -172,7 +172,7 @@ function TechTree() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -183,7 +183,7 @@ function TechTree() {
               {
                 ...dotTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DotTemplate}>
                     <div className={styles.DotTitleBackground} style={{ backgroundColor: itemTitleColor }} />
                   </div>;
@@ -246,7 +246,7 @@ function TechTree() {
                   dispatch(setTemplateOption('defaultTemplate', name, value));
                   break;
                 case 'annotation':
-                  dispatch(setAnnotationOption(primitives.common.AnnotationType.Connector, name, value));
+                  dispatch(setAnnotationOption(AnnotationType.Connector, name, value));
                   break;
                 default:
                   dispatch(setConfigOption(name, value)) 
@@ -264,20 +264,20 @@ function TechTree() {
         onClose= {() => setPdfDialogOpen(false)}
         templates={[
           {
-            ...(new primitives.orgdiagram.TemplateConfig()),
+            ...(new TemplateConfig()),
             name: "defaultTemplate",
             itemTemplate: "Use onItemRener method.",
-            itemSize: new primitives.common.Size(164, 34),
-            highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+            itemSize: new Size(164, 34),
+            highlightPadding: new Thickness(2, 2, 2, 2)
           }
         ]}
         onItemRender={(doc, position, data) => {
           var itemConfig = data.context,
-            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue,
-            color = primitives.common.highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
+            itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue,
+            color = highestContrast(itemTitleColor, config.itemTitleSecondFontColor, config.itemTitleFirstFontColor);
   
           if (data.templateName === "defaultTemplate") {
-            var contentSize = new primitives.common.Size(164, 34);
+            var contentSize = new Size(164, 34);
   
             contentSize.width -= 2;
             contentSize.height -= 2;
diff --git a/client/src/containers/UseCases/Editor.js b/client/src/containers/UseCases/Editor.js
index e5ade4d..fefe00f 100644
--- a/client/src/containers/UseCases/Editor.js
+++ b/client/src/containers/UseCases/Editor.js
@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import {Controlled as CodeMirror} from 'react-codemirror2'
-require('codemirror/lib/codemirror.css');
-require('codemirror/theme/material.css');
-require('codemirror/mode/javascript/javascript');
+import 'codemirror/lib/codemirror.css';
+import 'codemirror/theme/material.css';
+import 'codemirror/mode/javascript/javascript';
 
 class Editor extends Component {
   static propTypes = {
diff --git a/client/src/containers/UseCases/HowToUse.js b/client/src/containers/UseCases/HowToUse.js
index b9df7e7..9aebb9f 100644
--- a/client/src/containers/UseCases/HowToUse.js
+++ b/client/src/containers/UseCases/HowToUse.js
@@ -89,7 +89,7 @@ function HowToUse(props) {
     <>
       <Helmet>
         <title>{` for JavaScript - ${title}`}</title>
-        <meta name="description" content="JavaScript/jQuery/PDFKit Product Samples." />
+        <meta name="description" content="JavaScript/Bootstrap/PDFKit Product Samples." />
       </Helmet>
       <Container fixed>
         <MDReactComponent text={markdown} onIterate={handleIterate} />
diff --git a/client/src/containers/VerticalLayout/VerticalLayout.js b/client/src/containers/VerticalLayout/VerticalLayout.js
index b631014..6103887 100644
--- a/client/src/containers/VerticalLayout/VerticalLayout.js
+++ b/client/src/containers/VerticalLayout/VerticalLayout.js
@@ -19,7 +19,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { batch, useSelector, useDispatch } from 'react-redux';
 import MDReactComponent from 'markdown-react-js';
 import { OrgDiagram } from 'basicprimitivesreact';
-import primitives from 'basicprimitives';
+import { HorizontalAlignmentType, Colors } from 'basicprimitives';
 import {
   load,
   loadMarkdown,
@@ -150,7 +150,7 @@ function VerticalLayout() {
         <FormControlLabel
           control={
             <Switch
-              checked={config.horizontalAlignment === primitives.common.HorizontalAlignmentType.Left}
+              checked={config.horizontalAlignment === HorizontalAlignmentType.Left}
               onChange={() => dispatch(switchLTR())}
               color="primary"
               name="switchLTR"
@@ -197,7 +197,7 @@ function VerticalLayout() {
               {
                 ...templateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.DefaultTemplate}>
                     <div className={styles.DefaultTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.DefaultTitle}>{itemConfig.title}</div>
@@ -212,7 +212,7 @@ function VerticalLayout() {
               {
                 ...contactTemplateConfig,
                 onItemRender: ({ context: itemConfig }) => {
-                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : primitives.common.Colors.RoyalBlue;
+                  const itemTitleColor = itemConfig.itemTitleColor != null ? itemConfig.itemTitleColor : Colors.RoyalBlue;
                   return <div className={styles.ContactTemplate}>
                     <div className={styles.ContactTitleBackground} style={{ backgroundColor: itemTitleColor }}>
                       <div className={styles.ContactTitle}>{itemConfig.title}</div>
diff --git a/client/src/redux/modules/demos/crossteamgroup.js b/client/src/redux/modules/demos/crossteamgroup.js
index 4ca319b..c65f494 100644
--- a/client/src/redux/modules/demos/crossteamgroup.js
+++ b/client/src/redux/modules/demos/crossteamgroup.js
@@ -1,4 +1,8 @@
-const primitives = require('basicprimitives');
+import { OrgConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, GraphicsType} from 'basicprimitives';
 
 const LOAD = 'redux-example/crossteamgroup/LOAD';
 const LOAD_SUCCESS = 'redux-example/crossteamgroup/LOAD_SUCCESS';
@@ -32,58 +36,58 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.orgdiagram.Config(),
+    ...new OrgConfig(),
     cursorItem: 0,
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: null,
-        minimizedItemSize: new primitives.common.Size(4, 4),
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(4, 4),
+        highlightPadding: new Thickness(2, 2, 2, 2),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
       },
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(220, 120)
+        itemSize: new Size(220, 120)
       }
     ],
     items: [],
     selectedItems: [41, 48, 181, 189, 276, 338],
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Left,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Left,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Left,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Left,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
     maximumColumnsInMatrix: 6,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.FullStack,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.FullStack,
 
-    hasButtons: primitives.common.Enabled.Auto,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    hasButtons: Enabled.Auto,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
@@ -97,31 +101,31 @@ const initialState = {
     cousinsIntervalMultiplier: 0,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.Children,
+    arrowsDirection: GroupByType.Children,
     showExtraArrows: false,
     extraArrowsMinimumSpace: 30,
-    connectorType: primitives.common.ConnectorType.Curved,
-    elbowType: primitives.common.ElbowType.None,
+    connectorType: ConnectorType.Curved,
+    elbowType: ElbowType.None,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Silver,
+    linesType: LineType.Solid,
+    linesColor: Colors.Silver,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.True,
-    labelSize: new primitives.common.Size(100, 10),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Right,
+    showLabels: Enabled.True,
+    labelSize: new Size(100, 10),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Right,
     labelOffset: 4,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -133,7 +137,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true,
 
@@ -141,7 +145,7 @@ const initialState = {
     showFrame: true,
 
     /* Graphics */
-    graphicsType: primitives.common.GraphicsType.SVG,
+    graphicsType: GraphicsType.SVG,
 
     scale: 1.0
   },
@@ -183,7 +187,7 @@ function getSelectedItems(config, selectedItems) {
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: (primitives.common.Enabled.True),
+            showCallout: (Enabled.True),
             groupTitle: 'General Audit',
             groupTitleColor: 'Green'
           };
@@ -192,7 +196,7 @@ function getSelectedItems(config, selectedItems) {
           return {
             ...item,
             templateName: null,
-            showCallout: (primitives.common.Enabled.Auto),
+            showCallout: (Enabled.Auto),
             groupTitle: null,
             groupTitleColor: null
           };
diff --git a/client/src/redux/modules/demos/dependencies.js b/client/src/redux/modules/demos/dependencies.js
index aef2c01..0336771 100644
--- a/client/src/redux/modules/demos/dependencies.js
+++ b/client/src/redux/modules/demos/dependencies.js
@@ -1,4 +1,11 @@
-const primitives = require('basicprimitives');
+import { FamConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, NeighboursSelectionMode, LoopsLayoutMode,
+  AnnotationType, ZOrderType, ConnectorShapeType, ConnectorPlacementType, ConnectorLabelPlacementType,
+  PaletteItemConfig, HighlightPathAnnotationConfig, ConnectorAnnotationConfig } from 'basicprimitives';
+
 
 const LOAD = 'redux-example/dependencies/LOAD';
 const LOAD_SUCCESS = 'redux-example/dependencies/LOAD_SUCCESS';
@@ -31,91 +38,91 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.famdiagram.Config(),
+    ...new FamConfig(),
     defaultTemplateName: 'defaultTemplate',
     defaultCalloutTemplateName: 'contactTemplate',
     templates: [
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: 3,
-        minimizedItemSize: new primitives.common.Size(8, 8),
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(8, 8),
+        highlightPadding: new Thickness(2, 2, 2, 2),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 0,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0,
-        itemSize: new primitives.common.Size(80, 50)
+        itemSize: new Size(80, 50)
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(220, 200)
+        itemSize: new Size(220, 200)
       }
     ],
     linesPalette: [
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#C6C6C6', lineWidth: 1, lineType: primitives.common.LineType.Solid }), // 1
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#A5A5A5', lineWidth: 1, lineType: primitives.common.LineType.Dashed }), // 4
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#848484', lineWidth: 1, lineType: primitives.common.LineType.Solid }), // 7
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#646464', lineWidth: 1, lineType: primitives.common.LineType.Dashed }), // 10
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#454545', lineWidth: 1, lineType: primitives.common.LineType.Solid }) // 13
+      new PaletteItemConfig({ lineColor: '#C6C6C6', lineWidth: 1, lineType: LineType.Solid }), // 1
+      new PaletteItemConfig({ lineColor: '#A5A5A5', lineWidth: 1, lineType: LineType.Dashed }), // 4
+      new PaletteItemConfig({ lineColor: '#848484', lineWidth: 1, lineType: LineType.Solid }), // 7
+      new PaletteItemConfig({ lineColor: '#646464', lineWidth: 1, lineType: LineType.Dashed }), // 10
+      new PaletteItemConfig({ lineColor: '#454545', lineWidth: 1, lineType: LineType.Solid }) // 13
     ],
     annotations: [
       {
-        annotationType: primitives.common.AnnotationType.Connector,
-        connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-        labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-        zOrderType: primitives.common.ZOrderType.Foreground,
+        annotationType: AnnotationType.Connector,
+        connectorPlacementType: ConnectorPlacementType.Offbeat,
+        labelPlacementType: ConnectorLabelPlacementType.Between,
+        zOrderType: ZOrderType.Foreground,
         fromItem: 5,
         toItem: 8,
         label: { color: "red", badge: "1", title: "Connector annotation" },
-        labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-        connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-        color: primitives.common.Colors.Red,
+        labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+        connectorShapeType: ConnectorShapeType.OneWay,
+        color: Colors.Red,
         offset: 5,
         lineWidth: 2,
-        lineType: primitives.common.LineType.Dashed
+        lineType: LineType.Dashed
       }
     ],
     cursorItem: 0,
     items: [],
 
     /* Layout */
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Left,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.None,
-
-    hasButtons: primitives.common.Enabled.Auto,
-    hasSelectorCheckbox: primitives.common.Enabled.Auto,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Left,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.None,
+
+    hasButtons: Enabled.Auto,
+    hasSelectorCheckbox: Enabled.Auto,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
     /* Family Diagram Specific Options */
-    neighboursSelectionMode: primitives.common.NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
-    groupByType: primitives.common.GroupByType.Children,
-    loopsLayoutMode: primitives.common.LoopsLayoutMode.Optimized,
+    neighboursSelectionMode: NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
+    groupByType: GroupByType.Children,
+    loopsLayoutMode: LoopsLayoutMode.Optimized,
     alignBylevels: true,
     hideGrandParentsConnectors: true,
     enableMatrixLayout: false,
@@ -132,31 +139,31 @@ const initialState = {
     cousinsIntervalMultiplier: 1,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.Parents,
+    arrowsDirection: GroupByType.Parents,
     showExtraArrows: true,
     extraArrowsMinimumSpace: 20,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.Round,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.Round,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Black,
+    linesType: LineType.Solid,
+    linesColor: Colors.Black,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.False,
-    labelSize: new primitives.common.Size(80, 24),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Top,
+    showLabels: Enabled.False,
+    labelSize: new Size(80, 24),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Top,
     labelOffset: 1,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -168,7 +175,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true
   },
@@ -216,7 +223,7 @@ function getCursorItem(config, children, parents, cursorItem) {
   const childrenItems = children[cursorItem] || [];
   const items = [...parentItems, ...childrenItems];
   let newAnnotations = annotations.reduce((agg, annotation) => {
-    if (annotation.annotationType !== primitives.common.AnnotationType.HighlightPath) {
+    if (annotation.annotationType !== AnnotationType.HighlightPath) {
       agg.push(annotation);
     }
     return agg;
@@ -225,12 +232,12 @@ function getCursorItem(config, children, parents, cursorItem) {
   if (cursorItem !== null) {
     newAnnotations = newAnnotations.concat(
       items.map(
-        id => new primitives.famdiagram.HighlightPathAnnotationConfig({
+        id => new HighlightPathAnnotationConfig({
           items: [cursorItem, id],
-          color: primitives.common.Colors.Navy,
+          color: Colors.Navy,
           opacity: 0.2,
           lineWidth: 16,
-          zOrderType: primitives.common.ZOrderType.Background,
+          zOrderType: ZOrderType.Background,
           showArrows: false
         })
       )
@@ -252,21 +259,21 @@ function getCursorItem(config, children, parents, cursorItem) {
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: primitives.common.Enabled.True
+            showCallout: Enabled.True
           };
         }
         if (directlyConnectedItems[item.id]) {
           return {
             ...item,
             templateName: 'directTemplate',
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         if (item.templateName != null) {
           return {
             ...item,
             templateName: null,
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         return item;
@@ -282,7 +289,7 @@ function getAnnotations(config) {
     return {
       ...config,
       annotations: config.annotations.map(annotation => ({
-        ...new primitives.famdiagram.ConnectorAnnotationConfig(),
+        ...new ConnectorAnnotationConfig(),
         ...annotation
       }))
     };
@@ -447,7 +454,7 @@ export default function reducer(state = initialState, action = {}) {
         config: {
           ...restConfig,
           annotations: annotations.map(annotation => {
-            if (annotation.annotationType === primitives.common.AnnotationType.Connector) {
+            if (annotation.annotationType === AnnotationType.Connector) {
               const newAnnotation = { ...annotation };
               newAnnotation[action.option] = action.itemId;
               return newAnnotation;
diff --git a/client/src/redux/modules/demos/dynamicloading.js b/client/src/redux/modules/demos/dynamicloading.js
index e7d2674..651a8cd 100644
--- a/client/src/redux/modules/demos/dynamicloading.js
+++ b/client/src/redux/modules/demos/dynamicloading.js
@@ -1,4 +1,8 @@
-const primitives = require('basicprimitives');
+import { OrgConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode} from 'basicprimitives';
 
 const LOAD = 'redux-example/dynamicloading/LOAD';
 const LOAD_SUCCESS = 'redux-example/dynamicloading/LOAD_SUCCESS';
@@ -33,57 +37,57 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.orgdiagram.Config(),
+    ...new OrgConfig(),
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
-        itemSize: new primitives.common.Size(180, 90),
+        itemSize: new Size(180, 90),
         minimizedItemCornerRadius: 10,
-        minimizedItemSize: new primitives.common.Size(10, 10),
-        highlightPadding: new primitives.common.Thickness(6, 6, 6, 6),
-        minimizedItemShapeType: primitives.common.ShapeType.Circle,
+        minimizedItemSize: new Size(10, 10),
+        highlightPadding: new Thickness(6, 6, 6, 6),
+        minimizedItemShapeType: ShapeType.Circle,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
       },
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(220, 120)
+        itemSize: new Size(220, 120)
       }
     ],
 
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Top,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Top,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
     maximumColumnsInMatrix: 6,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.FullStack,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.FullStack,
 
-    hasButtons: primitives.common.Enabled.Auto,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    hasButtons: Enabled.Auto,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
@@ -97,31 +101,31 @@ const initialState = {
     cousinsIntervalMultiplier: 2,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.None,
+    arrowsDirection: GroupByType.None,
     showExtraArrows: false,
     extraArrowsMinimumSpace: 30,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.None,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.None,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Silver,
+    linesType: LineType.Solid,
+    linesColor: Colors.Silver,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.Auto,
-    labelSize: new primitives.common.Size(80, 24),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Top,
+    showLabels: Enabled.Auto,
+    labelSize: new Size(80, 24),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Top,
     labelOffset: 2,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -133,7 +137,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true,
 
@@ -175,14 +179,14 @@ function getCursorItem(config, cursorItem) {
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: primitives.common.Enabled.True
+            showCallout: Enabled.True
           };
         }
         if (item.templateName != null) {
           return {
             ...item,
             templateName: null,
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         return item;
diff --git a/client/src/redux/modules/demos/familychartitemsordering.js b/client/src/redux/modules/demos/familychartitemsordering.js
index 3de0f22..75d58e2 100644
--- a/client/src/redux/modules/demos/familychartitemsordering.js
+++ b/client/src/redux/modules/demos/familychartitemsordering.js
@@ -1,4 +1,10 @@
-const primitives = require('basicprimitives');
+import { FamConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, NeighboursSelectionMode, LoopsLayoutMode,
+  AnnotationType, ZOrderType, ConnectorShapeType, ConnectorPlacementType, ConnectorLabelPlacementType
+} from 'basicprimitives';
 
 const LOAD = 'redux-example/familychartitemsordering/LOAD';
 const LOAD_SUCCESS = 'redux-example/familychartitemsordering/LOAD_SUCCESS';
@@ -32,37 +38,37 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.famdiagram.Config(),
+    ...new FamConfig(),
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: 8,
-        minimizedItemSize: new primitives.common.Size(16, 16),
-        highlightPadding: new primitives.common.Thickness(4, 4, 4, 4),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(16, 16),
+        highlightPadding: new Thickness(4, 4, 4, 4),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(220, 120)
+        itemSize: new Size(220, 120)
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'miniTemplate',
         isActive: false,
-        itemSize: new primitives.common.Size(100, 26),
+        itemSize: new Size(100, 26),
         minimizedItemCornerRadius: 4,
-        minimizedItemSize: new primitives.common.Size(8, 8),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(8, 8),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
@@ -72,39 +78,39 @@ const initialState = {
     items: [],
 
     /* Layout */
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Top,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.None,
-
-    hasButtons: primitives.common.Enabled.Auto,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Top,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.None,
+
+    hasButtons: Enabled.Auto,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
     /* Family Diagram Specific Options */
-    neighboursSelectionMode: primitives.common.NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
-    groupByType: primitives.common.GroupByType.Children,
-    loopsLayoutMode: primitives.common.LoopsLayoutMode.Optimized,
+    neighboursSelectionMode: NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
+    groupByType: GroupByType.Children,
+    loopsLayoutMode: LoopsLayoutMode.Optimized,
     alignBylevels: true,
     hideGrandParentsConnectors: false,
     enableMatrixLayout: false,
@@ -123,31 +129,31 @@ const initialState = {
     cousinsIntervalMultiplier: 0,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.Parents,
+    arrowsDirection: GroupByType.Parents,
     showExtraArrows: true,
     extraArrowsMinimumSpace: 30,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.Round,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.Round,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Black,
+    linesType: LineType.Solid,
+    linesColor: Colors.Black,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.Auto,
-    labelSize: new primitives.common.Size(60, 40),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Top,
+    showLabels: Enabled.Auto,
+    labelSize: new Size(60, 40),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Top,
     labelOffset: 1,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -159,7 +165,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true
   },
@@ -208,14 +214,14 @@ function getCursorItem(config, cursorItem) {
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: primitives.common.Enabled.True
+            showCallout: Enabled.True
           };
         }
         if (item.templateName === "contactTemplate") {
           return {
             ...item,
             templateName: null,
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         return item;
@@ -243,18 +249,18 @@ export default function reducer(state = initialState, action = {}) {
         let item = items[index];
         if (item.relativeItem != null) {
           annotations.push({
-            annotationType: primitives.common.AnnotationType.Connector,
+            annotationType: AnnotationType.Connector,
             fromItem: item.id,
             toItem: item.relativeItem,
             label: null,
-            connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-            color: primitives.common.Colors.Red,
+            connectorShapeType: ConnectorShapeType.OneWay,
+            color: Colors.Red,
             offset: -45,
             lineWidth: 3,
-            lineType: primitives.common.LineType.Dotted,
-            connectorPlacementType: primitives.common.ConnectorPlacementType.Straight,
-            labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-            zOrderType: primitives.common.ZOrderType.Foreground
+            lineType: LineType.Dotted,
+            connectorPlacementType: ConnectorPlacementType.Straight,
+            labelPlacementType: ConnectorLabelPlacementType.Between,
+            zOrderType: ZOrderType.Foreground
           });
         }
       };
@@ -385,7 +391,7 @@ export default function reducer(state = initialState, action = {}) {
       const childItems = children[id] || [];
 
       let newAnnotations = annotations.reduce((agg, annotation) => {
-        if (annotation.annotationType !== primitives.common.AnnotationType.HighlightPath) {
+        if (annotation.annotationType !== AnnotationType.HighlightPath) {
           agg.push(annotation);
         }
         return agg;
@@ -395,12 +401,12 @@ export default function reducer(state = initialState, action = {}) {
         const items = [...parentItems, ...childItems];
         newAnnotations = newAnnotations.concat(
           items.map(itemid => ({
-            annotationType: primitives.common.AnnotationType.HighlightPath,
+            annotationType: AnnotationType.HighlightPath,
             items: [id, itemid],
-            color: primitives.common.Colors.Navy,
+            color: Colors.Navy,
             opacity: 0.2,
             lineWidth: 16,
-            zOrderType: primitives.common.ZOrderType.Background,
+            zOrderType: ZOrderType.Background,
             showArrows: false
           })
           )
diff --git a/client/src/redux/modules/demos/familychartwithannotations.js b/client/src/redux/modules/demos/familychartwithannotations.js
index bef2a22..92ae01b 100644
--- a/client/src/redux/modules/demos/familychartwithannotations.js
+++ b/client/src/redux/modules/demos/familychartwithannotations.js
@@ -1,4 +1,10 @@
-const primitives = require('basicprimitives');
+import { FamConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, NeighboursSelectionMode, LoopsLayoutMode,
+  AnnotationType, ZOrderType} from 'basicprimitives';
+
 
 const LOAD = 'redux-example/familychartwithannotations/LOAD';
 const LOAD_SUCCESS = 'redux-example/familychartwithannotations/LOAD_SUCCESS';
@@ -34,37 +40,37 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.famdiagram.Config(),
+    ...new FamConfig(),
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: 8,
-        minimizedItemSize: new primitives.common.Size(16, 16),
-        highlightPadding: new primitives.common.Thickness(4, 4, 4, 4),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(16, 16),
+        highlightPadding: new Thickness(4, 4, 4, 4),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(220, 120)
+        itemSize: new Size(220, 120)
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'miniTemplate',
         isActive: false,
-        itemSize: new primitives.common.Size(100, 26),
+        itemSize: new Size(100, 26),
         minimizedItemCornerRadius: 4,
-        minimizedItemSize: new primitives.common.Size(8, 8),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(8, 8),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
@@ -74,39 +80,39 @@ const initialState = {
     items: [],
 
     /* Layout */
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Top,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.None,
-
-    hasButtons: primitives.common.Enabled.Auto,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Top,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.None,
+
+    hasButtons: Enabled.Auto,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
     /* Family Diagram Specific Options */
-    neighboursSelectionMode: primitives.common.NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
-    groupByType: primitives.common.GroupByType.Children,
-    loopsLayoutMode: primitives.common.LoopsLayoutMode.Optimized,
+    neighboursSelectionMode: NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
+    groupByType: GroupByType.Children,
+    loopsLayoutMode: LoopsLayoutMode.Optimized,
     alignBylevels: true,
     hideGrandParentsConnectors: false,
     enableMatrixLayout: false,
@@ -125,31 +131,31 @@ const initialState = {
     cousinsIntervalMultiplier: 0,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.Parents,
+    arrowsDirection: GroupByType.Parents,
     showExtraArrows: true,
     extraArrowsMinimumSpace: 30,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.Round,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.Round,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Black,
+    linesType: LineType.Solid,
+    linesColor: Colors.Black,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.Auto,
-    labelSize: new primitives.common.Size(60, 40),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Top,
+    showLabels: Enabled.Auto,
+    labelSize: new Size(60, 40),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Top,
     labelOffset: 1,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -161,7 +167,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true,
 
@@ -212,14 +218,14 @@ function getCursorItem(config, cursorItem) {
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: primitives.common.Enabled.True
+            showCallout: Enabled.True
           };
         }
         if (item.templateName === "contactTemplate") {
           return {
             ...item,
             templateName: null,
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         return item;
@@ -372,7 +378,7 @@ export default function reducer(state = initialState, action = {}) {
       const childItems = children[id] || [];
 
       let newAnnotations = annotations.reduce((agg, annotation) => {
-        if (annotation.annotationType !== primitives.common.AnnotationType.HighlightPath) {
+        if (annotation.annotationType !== AnnotationType.HighlightPath) {
           agg.push(annotation);
         }
         return agg;
@@ -382,12 +388,12 @@ export default function reducer(state = initialState, action = {}) {
         const items = [...parentItems, ...childItems];
         newAnnotations = newAnnotations.concat(
           items.map(itemid => ({
-            annotationType: primitives.common.AnnotationType.HighlightPath,
+            annotationType: AnnotationType.HighlightPath,
             items: [id, itemid],
-            color: primitives.common.Colors.Navy,
+            color: Colors.Navy,
             opacity: 0.2,
             lineWidth: 16,
-            zOrderType: primitives.common.ZOrderType.Background,
+            zOrderType: ZOrderType.Background,
             showArrows: false
           })
           )
@@ -426,7 +432,7 @@ export default function reducer(state = initialState, action = {}) {
         config: {
           ...restConfig,
           annotations: annotations.map(annotation => {
-            if (annotation.annotationType === primitives.common.AnnotationType.Connector) {
+            if (annotation.annotationType === AnnotationType.Connector) {
               const newAnnotation = { ...annotation };
               newAnnotation[action.option] = action.itemId;
               return newAnnotation;
diff --git a/client/src/redux/modules/demos/financialownership.js b/client/src/redux/modules/demos/financialownership.js
index ffc0579..f0e235d 100644
--- a/client/src/redux/modules/demos/financialownership.js
+++ b/client/src/redux/modules/demos/financialownership.js
@@ -1,4 +1,10 @@
-const primitives = require('basicprimitives');
+import { FamConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, NeighboursSelectionMode, LoopsLayoutMode,
+  AnnotationType, ZOrderType, ConnectorShapeType, ConnectorPlacementType, ConnectorLabelPlacementType,
+  PaletteItemConfig, ConnectorAnnotationConfig } from 'basicprimitives';
 
 const LOAD = 'redux-example/financialownership/LOAD';
 const LOAD_SUCCESS = 'redux-example/financialownership/LOAD_SUCCESS';
@@ -31,110 +37,110 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.famdiagram.Config(),
+    ...new FamConfig(),
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
-        itemSize: new primitives.common.Size(220, 80),
-        minimizedItemSize: new primitives.common.Size(30, 30),
+        itemSize: new Size(220, 80),
+        minimizedItemSize: new Size(30, 30),
         minimizedItemCornerRadius: 1, // Sligtly rounded corners
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null, // Shape border line has the same color as item title background color
         minimizedItemFillColor: null, // Shape background has the same color as item title background color
         minimizedItemOpacity: 0.7, // Shape background opacity
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+        highlightPadding: new Thickness(2, 2, 2, 2)
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'unitTemplate',
-        itemSize: new primitives.common.Size(220, 60),
-        minimizedItemSize: new primitives.common.Size(30, 30),
+        itemSize: new Size(220, 60),
+        minimizedItemSize: new Size(30, 30),
         minimizedItemCornerRadius: 1, // Sligtly rounded corners
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null, // Shape border line has the same color as item title background color
         minimizedItemFillColor: null, // Shape background has the same color as item title background color
         minimizedItemOpacity: 0.7, // Shape background opacity
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+        highlightPadding: new Thickness(2, 2, 2, 2)
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'ShapeTemplate',
-        itemSize: new primitives.common.Size(100, 100),
+        itemSize: new Size(100, 100),
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null, // Shape border line has the same color as item title background color
         minimizedItemFillColor: null, // Shape background has the same color as item title background color
         minimizedItemOpacity: 0.7, // Shape background opacity
         minimizedItemCornerRadius: 1, // Sligtly rounded corners
-        minimizedItemSize: new primitives.common.Size(16, 16),
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+        minimizedItemSize: new Size(16, 16),
+        highlightPadding: new Thickness(2, 2, 2, 2)
       }
     ],
     linesPalette: [
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#C6C6C6', lineWidth: 1, lineType: primitives.common.LineType.Solid }), // 1
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#A5A5A5', lineWidth: 1, lineType: primitives.common.LineType.Dashed }), // 4
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#848484', lineWidth: 1, lineType: primitives.common.LineType.Solid }), // 7
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#646464', lineWidth: 1, lineType: primitives.common.LineType.Dashed }), // 10
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#454545', lineWidth: 1, lineType: primitives.common.LineType.Solid }) // 13
+      new PaletteItemConfig({ lineColor: '#C6C6C6', lineWidth: 1, lineType: LineType.Solid }), // 1
+      new PaletteItemConfig({ lineColor: '#A5A5A5', lineWidth: 1, lineType: LineType.Dashed }), // 4
+      new PaletteItemConfig({ lineColor: '#848484', lineWidth: 1, lineType: LineType.Solid }), // 7
+      new PaletteItemConfig({ lineColor: '#646464', lineWidth: 1, lineType: LineType.Dashed }), // 10
+      new PaletteItemConfig({ lineColor: '#454545', lineWidth: 1, lineType: LineType.Solid }) // 13
     ],
     annotations: [
-      new primitives.famdiagram.ConnectorAnnotationConfig({
-        annotationType: primitives.common.AnnotationType.Connector,
+      new ConnectorAnnotationConfig({
+        annotationType: AnnotationType.Connector,
         fromItem: 5,
         toItem: 8,
         label: { color: "red", badge: "1", title: "Connector annotation" },
-        labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-        connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-        connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-        labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-        zOrderType: primitives.common.ZOrderType.Foreground,
-        color: primitives.common.Colors.Red,
+        labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+        connectorShapeType: ConnectorShapeType.OneWay,
+        connectorPlacementType: ConnectorPlacementType.Offbeat,
+        labelPlacementType: ConnectorLabelPlacementType.Between,
+        zOrderType: ZOrderType.Foreground,
+        color: Colors.Red,
         offset: 5,
         lineWidth: 2,
-        lineType: primitives.common.LineType.Dashed
+        lineType: LineType.Dashed
       })
     ],
     cursorItem: 0,
     items: [],
 
     /* Layout */
-    pageFitMode: primitives.common.PageFitMode.None,
-    orientationType: primitives.common.OrientationType.Top,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.FullStack,
-
-    hasButtons: primitives.common.Enabled.True,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    pageFitMode: PageFitMode.None,
+    orientationType: OrientationType.Top,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.FullStack,
+
+    hasButtons: Enabled.True,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
     /* Family Diagram Specific Options */
-    neighboursSelectionMode: primitives.common.NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
-    groupByType: primitives.common.GroupByType.Children,
-    loopsLayoutMode: primitives.common.LoopsLayoutMode.Optimized,
+    neighboursSelectionMode: NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
+    groupByType: GroupByType.Children,
+    loopsLayoutMode: LoopsLayoutMode.Optimized,
     alignBylevels: true,
     hideGrandParentsConnectors: true,
     enableMatrixLayout: false,
@@ -151,35 +157,35 @@ const initialState = {
     cousinsIntervalMultiplier: 1,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.Children,
+    arrowsDirection: GroupByType.Children,
     showExtraArrows: false,
     extraArrowsMinimumSpace: 20,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.Round,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.Round,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Black,
+    linesType: LineType.Solid,
+    linesColor: Colors.Black,
     linesWidth: 1,
 
-    highlightLinesColor: primitives.common.Colors.Red,
+    highlightLinesColor: Colors.Red,
     highlightLinesWidth: 2,
-    highlightLinesType: primitives.common.LineType.Solid,
+    highlightLinesType: LineType.Solid,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.False,
-    labelSize: new primitives.common.Size(80, 24),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Top,
+    showLabels: Enabled.False,
+    labelSize: new Size(80, 24),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Top,
     labelOffset: 1,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -191,7 +197,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true
   },
@@ -388,7 +394,7 @@ export default function reducer(state = initialState, action = {}) {
         config: {
           ...restConfig,
           annotations: annotations.map(annotation => {
-            if (annotation.annotationType === primitives.common.AnnotationType.Connector) {
+            if (annotation.annotationType === AnnotationType.Connector) {
               const newAnnotation = { ...annotation };
               newAnnotation[action.option] = action.itemId;
               return newAnnotation;
diff --git a/client/src/redux/modules/demos/highlightannotations.js b/client/src/redux/modules/demos/highlightannotations.js
index 45be974..b482c19 100644
--- a/client/src/redux/modules/demos/highlightannotations.js
+++ b/client/src/redux/modules/demos/highlightannotations.js
@@ -1,4 +1,5 @@
-const primitives = require('basicprimitives');
+import { OrgConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, ConnectorAnnotationConfig, ConnectorPlacementType} from 'basicprimitives';
 
 const LOAD = 'redux-example/highlightannotations/LOAD';
 const LOAD_SUCCESS = 'redux-example/highlightannotations/LOAD_SUCCESS';
@@ -33,43 +34,43 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.orgdiagram.Config(),
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
+    ...new OrgConfig(),
+    pageFitMode: PageFitMode.FitToPage,
     cursorItem: 0,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
-    hasButtons: primitives.common.Enabled.Auto,
+    hasSelectorCheckbox: Enabled.True,
+    hasButtons: Enabled.Auto,
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: 8,
-        minimizedItemSize: new primitives.common.Size(6, 6),
-        highlightPadding: new primitives.common.Thickness(6, 6, 6, 6),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(6, 6),
+        highlightPadding: new Thickness(6, 6, 6, 6),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 0,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
       },
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultConnectedItemTemplate',
         minimizedItemCornerRadius: 12,
-        minimizedItemSize: new primitives.common.Size(12, 12),
-        highlightPadding: new primitives.common.Thickness(6, 6, 6, 6),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(12, 12),
+        highlightPadding: new Thickness(6, 6, 6, 6),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 0,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
       },
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(220, 120)
+        itemSize: new Size(220, 120)
       }
     ],
     normalLevelShift: 30,
@@ -92,12 +93,12 @@ function getAnnotationsHash(links = []) {
   const annotations = links.map(({
     fromItem, toItem, lineType, color, connectorShapeType
   }, index) => {
-    const annotation = new primitives.orgdiagram.ConnectorAnnotationConfig(fromItem, toItem);
+    const annotation = new ConnectorAnnotationConfig(fromItem, toItem);
     annotation.id = index;
     annotation.selectItems = true;
     annotation.lineType = lineType;
     annotation.color = color;
-    annotation.connectorPlacementType = primitives.common.ConnectorPlacementType.Straight;
+    annotation.connectorPlacementType = ConnectorPlacementType.Straight;
     annotation.connectorShapeType = connectorShapeType;
 
     annotationsHash[fromItem] = annotationsHash[fromItem] || [];
@@ -165,21 +166,21 @@ function getCursorItem(config, centerOnCursor, cursorItem, highlightItem, annota
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: primitives.common.Enabled.True
+            showCallout: Enabled.True
           };
         }
         if (annotationsHash[id] != null) {
           return {
             ...item,
             templateName: 'defaultConnectedItemTemplate',
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         if (item.templateName != null) {
           return {
             id,
             ...restItem,
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         return item;
diff --git a/client/src/redux/modules/demos/largeorganizationalchart.js b/client/src/redux/modules/demos/largeorganizationalchart.js
index a57ec6f..91c0594 100644
--- a/client/src/redux/modules/demos/largeorganizationalchart.js
+++ b/client/src/redux/modules/demos/largeorganizationalchart.js
@@ -1,4 +1,5 @@
-const primitives = require('basicprimitives');
+import { OrgConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType} from 'basicprimitives';
 
 const LOAD = 'redux-example/largeorganizationalchart/LOAD';
 const LOAD_SUCCESS = 'redux-example/largeorganizationalchart/LOAD_SUCCESS';
@@ -32,31 +33,31 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.orgdiagram.Config(),
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
+    ...new OrgConfig(),
+    pageFitMode: PageFitMode.FitToPage,
     cursorItem: 0,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
-    hasButtons: primitives.common.Enabled.Auto,
+    hasSelectorCheckbox: Enabled.True,
+    hasButtons: Enabled.Auto,
     buttonsPanelSize: 42,
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: null,
-        minimizedItemSize: new primitives.common.Size(4, 4),
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(4, 4),
+        highlightPadding: new Thickness(2, 2, 2, 2),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
       },
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(220, 120)
+        itemSize: new Size(220, 120)
       }
     ],
     items: []
@@ -96,14 +97,14 @@ function getCursorItem(config, cursorItem) {
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: primitives.common.Enabled.True
+            showCallout: Enabled.True
           };
         }
         if (item.templateName != null) {
           return {
             ...item,
             templateName: null,
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         return item;
diff --git a/client/src/redux/modules/demos/mutualfinancialownership.js b/client/src/redux/modules/demos/mutualfinancialownership.js
index bb13533..a9288a4 100644
--- a/client/src/redux/modules/demos/mutualfinancialownership.js
+++ b/client/src/redux/modules/demos/mutualfinancialownership.js
@@ -1,4 +1,10 @@
-const primitives = require('basicprimitives');
+import { FamConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, NeighboursSelectionMode, LoopsLayoutMode,
+  AnnotationType, ZOrderType, ConnectorShapeType, ConnectorPlacementType, ConnectorLabelPlacementType,
+  PaletteItemConfig, ConnectorAnnotationConfig } from 'basicprimitives';
 
 const LOAD = 'redux-example/mutualfinancialownership/LOAD';
 const LOAD_SUCCESS = 'redux-example/mutualfinancialownership/LOAD_SUCCESS';
@@ -31,84 +37,84 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.famdiagram.Config(),
+    ...new FamConfig(),
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
-        itemSize: new primitives.common.Size(200, 180),
-        minimizedItemSize: new primitives.common.Size(20, 20),
+        itemSize: new Size(200, 180),
+        minimizedItemSize: new Size(20, 20),
         minimizedItemCornerRadius: 10, // Sligtly rounded corners
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null, // Shape border line has the same color as item title background color
         minimizedItemFillColor: null, // Shape background has the same color as item title background color
         minimizedItemOpacity: 0.7, // Shape background opacity
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2)
+        highlightPadding: new Thickness(2, 2, 2, 2)
       }
     ],
     linesPalette: [
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#C6C6C6', lineWidth: 1, lineType: primitives.common.LineType.Solid }), // 1
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#A5A5A5', lineWidth: 1, lineType: primitives.common.LineType.Dashed }), // 4
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#848484', lineWidth: 1, lineType: primitives.common.LineType.Solid }), // 7
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#646464', lineWidth: 1, lineType: primitives.common.LineType.Dashed }), // 10
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#454545', lineWidth: 1, lineType: primitives.common.LineType.Solid }) // 13
+      new PaletteItemConfig({ lineColor: '#C6C6C6', lineWidth: 1, lineType: LineType.Solid }), // 1
+      new PaletteItemConfig({ lineColor: '#A5A5A5', lineWidth: 1, lineType: LineType.Dashed }), // 4
+      new PaletteItemConfig({ lineColor: '#848484', lineWidth: 1, lineType: LineType.Solid }), // 7
+      new PaletteItemConfig({ lineColor: '#646464', lineWidth: 1, lineType: LineType.Dashed }), // 10
+      new PaletteItemConfig({ lineColor: '#454545', lineWidth: 1, lineType: LineType.Solid }) // 13
     ],
     annotations: [
-      new primitives.famdiagram.ConnectorAnnotationConfig({
-        annotationType: primitives.common.AnnotationType.Connector,
-        connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-        labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-        zOrderType: primitives.common.ZOrderType.Foreground,
+      new ConnectorAnnotationConfig({
+        annotationType: AnnotationType.Connector,
+        connectorPlacementType: ConnectorPlacementType.Offbeat,
+        labelPlacementType: ConnectorLabelPlacementType.Between,
+        zOrderType: ZOrderType.Foreground,
         fromItem: 5,
         toItem: 8,
         label: { color: 'red', badge: '1', title: 'Link' },
-        labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-        connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-        color: primitives.common.Colors.Red,
+        labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+        connectorShapeType: ConnectorShapeType.OneWay,
+        color: Colors.Red,
         offset: 5,
         lineWidth: 2,
-        lineType: primitives.common.LineType.Dashed
+        lineType: LineType.Dashed
       })
     ],
     cursorItem: 0,
     items: [],
-
+    
     /* Layout */
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Top,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.FullStack,
-
-    hasButtons: primitives.common.Enabled.True,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Top,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.FullStack,
+
+    hasButtons: Enabled.True,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
     /* Family Diagram Specific Options */
-    neighboursSelectionMode: primitives.common.NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
-    groupByType: primitives.common.GroupByType.Children,
-    loopsLayoutMode: primitives.common.LoopsLayoutMode.Optimized,
+    neighboursSelectionMode: NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
+    groupByType: GroupByType.Children,
+    loopsLayoutMode: LoopsLayoutMode.Optimized,
     alignBylevels: true,
     hideGrandParentsConnectors: true,
     enableMatrixLayout: false,
@@ -125,35 +131,35 @@ const initialState = {
     cousinsIntervalMultiplier: 1,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.Children,
+    arrowsDirection: GroupByType.Children,
     showExtraArrows: true,
     extraArrowsMinimumSpace: 20,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.Round,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.Round,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Black,
+    linesType: LineType.Solid,
+    linesColor: Colors.Black,
     linesWidth: 1,
 
-    highlightLinesColor: primitives.common.Colors.Red,
+    highlightLinesColor: Colors.Red,
     highlightLinesWidth: 2,
-    highlightLinesType: primitives.common.LineType.Solid,
+    highlightLinesType: LineType.Solid,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.False,
-    labelSize: new primitives.common.Size(80, 24),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Top,
+    showLabels: Enabled.False,
+    labelSize: new Size(80, 24),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Top,
     labelOffset: 1,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -165,7 +171,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true
   },
@@ -219,7 +225,7 @@ function getAnnotations(config) {
     return {
       ...config,
       annotations: config.annotations.map(annotation => ({
-        ...new primitives.famdiagram.ConnectorAnnotationConfig(),
+        ...new ConnectorAnnotationConfig(),
         ...annotation
       }))
     };
@@ -356,7 +362,7 @@ export default function reducer(state = initialState, action = {}) {
       const childItems = children[cursorItem] || [];
 
       let newAnnotations = annotations.reduce((agg, annotation) => {
-        if (annotation.annotationType !== primitives.common.AnnotationType.HighlightPath) {
+        if (annotation.annotationType !== AnnotationType.HighlightPath) {
           agg.push(annotation);
         }
         return agg;
@@ -367,12 +373,12 @@ export default function reducer(state = initialState, action = {}) {
         newAnnotations = newAnnotations.concat(
           items.map(
             itemid => ({
-              annotationType: primitives.common.AnnotationType.HighlightPath,
+              annotationType: AnnotationType.HighlightPath,
               items: [cursorItem, itemid],
-              color: primitives.common.Colors.Navy,
+              color: Colors.Navy,
               opacity: 0.2,
               lineWidth: 16,
-              zOrderType: primitives.common.ZOrderType.Background,
+              zOrderType: ZOrderType.Background,
               showArrows: false
             })
           )
@@ -415,7 +421,7 @@ export default function reducer(state = initialState, action = {}) {
         config: {
           ...restConfig,
           annotations: annotations.map(annotation => {
-            if (annotation.annotationType === primitives.common.AnnotationType.Connector) {
+            if (annotation.annotationType === AnnotationType.Connector) {
               const newAnnotation = { ...annotation };
               newAnnotation[action.option] = action.itemId;
               return newAnnotation;
diff --git a/client/src/redux/modules/demos/orgeditor.js b/client/src/redux/modules/demos/orgeditor.js
index 54a458c..cfbf433 100644
--- a/client/src/redux/modules/demos/orgeditor.js
+++ b/client/src/redux/modules/demos/orgeditor.js
@@ -1,4 +1,9 @@
-const primitives = require('basicprimitives');
+import { OrgConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, ShapeType,
+  Tree, LCA } from 'basicprimitives';
 
 const LOAD = 'redux-example/orgeditor/LOAD';
 const LOAD_SUCCESS = 'redux-example/orgeditor/LOAD_SUCCESS';
@@ -49,56 +54,56 @@ export const DrawerNames = {
 };
 
 const config = {
-  ...new primitives.orgdiagram.Config(),
+  ...new OrgConfig(),
   cursorItem: 0,
   defaultTemplateName: 'defaultTemplate',
   defaultCalloutTemplateName: 'defaultTemplate',
   templates: [
     {
-      ...new primitives.orgdiagram.TemplateConfig(),
+      ...new TemplateConfig(),
       name: 'defaultTemplate',
       minimizedItemCornerRadius: null,
-      minimizedItemSize: new primitives.common.Size(4, 4),
-      highlightPadding: new primitives.common.Thickness(2, 2, 2, 2),
-      minimizedItemShapeType: primitives.common.ShapeType.None,
+      minimizedItemSize: new Size(4, 4),
+      highlightPadding: new Thickness(2, 2, 2, 2),
+      minimizedItemShapeType: ShapeType.None,
       minimizedItemLineWidth: 1,
-      minimizedItemLineType: primitives.common.LineType.Solid,
+      minimizedItemLineType: LineType.Solid,
       minimizedItemBorderColor: null,
       minimizedItemFillColor: null,
       minimizedItemOpacity: 1.0
     },
     {
-      ...new primitives.orgdiagram.TemplateConfig(),
+      ...new TemplateConfig(),
       name: 'contactTemplate',
-      itemSize: new primitives.common.Size(220, 120)
+      itemSize: new Size(220, 120)
     }
   ],
   items: [],
   onSave: null,
   editMode: true,
-  navigationMode: primitives.common.NavigationMode.Default,
-  pageFitMode: primitives.common.PageFitMode.FitToPage,
-  verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-  arrowsDirection: primitives.common.GroupByType.None,
+  navigationMode: NavigationMode.Default,
+  pageFitMode: PageFitMode.FitToPage,
+  verticalAlignment: VerticalAlignmentType.Middle,
+  arrowsDirection: GroupByType.None,
   showExtraArrows: false,
   extraArrowsMinimumSpace: 30,
-  horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-  connectorType: primitives.common.ConnectorType.Angular,
+  horizontalAlignment: HorizontalAlignmentType.Center,
+  connectorType: ConnectorType.Angular,
   bevelSize: 4,
-  elbowType: primitives.common.ElbowType.None,
+  elbowType: ElbowType.None,
   elbowDotSize: 4,
   highlightGravityRadius: 40,
-  hasSelectorCheckbox: primitives.common.Enabled.True,
+  hasSelectorCheckbox: Enabled.True,
   selectCheckBoxLabel: 'Selected',
-  selectionPathMode: primitives.common.SelectionPathMode.FullStack,
-  hasButtons: primitives.common.Enabled.Auto,
-  minimalVisibility: primitives.common.Visibility.Dot,
-  orientationType: primitives.common.OrientationType.Top,
-  itemTitleFirstFontColor: primitives.common.Colors.White,
-  itemTitleSecondFontColor: primitives.common.Colors.Navy,
-  linesColor: primitives.common.Colors.Silver,
+  selectionPathMode: SelectionPathMode.FullStack,
+  hasButtons: Enabled.Auto,
+  minimalVisibility: Visibility.Dot,
+  orientationType: OrientationType.Top,
+  itemTitleFirstFontColor: Colors.White,
+  itemTitleSecondFontColor: Colors.Navy,
+  linesColor: Colors.Silver,
   linesWidth: 1,
-  linesType: primitives.common.LineType.Solid,
+  linesType: LineType.Solid,
   showCallout: true,
   calloutPlacementOffset: 100,
   calloutfillColor: '#000000',
@@ -108,18 +113,18 @@ const config = {
   calloutPointerWidth: '10%',
   calloutLineWidth: 1,
   calloutOpacity: 0.2,
-  childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-  leavesPlacementType: primitives.common.ChildrenPlacementType.Matrix,
+  childrenPlacementType: ChildrenPlacementType.Horizontal,
+  leavesPlacementType: ChildrenPlacementType.Matrix,
   maximumColumnsInMatrix: 6,
   buttonsPanelSize: 42,
   groupTitlePanelSize: 24,
   checkBoxPanelSize: 24,
-  groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-  groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-  groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+  groupTitleOrientation: TextOrientationType.RotateRight,
+  groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+  groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
   groupTitleFontSize: '12px',
   groupTitleFontFamily: 'Arial',
-  groupTitleColor: primitives.common.Colors.RoyalBlue,
+  groupTitleColor: Colors.RoyalBlue,
   groupTitleFontWeight: 'normal',
   groupTitleFontStyle: 'normal',
   scale: 1,
@@ -130,14 +135,14 @@ const config = {
   dotItemsInterval: 10,
   lineItemsInterval: 5,
   cousinsIntervalMultiplier: 5,
-  showLabels: primitives.common.Enabled.Auto,
-  labelSize: new primitives.common.Size(10, 24),
+  showLabels: Enabled.Auto,
+  labelSize: new Size(10, 24),
   labelOffset: 1,
-  labelOrientation: primitives.text.TextOrientationType.Horizontal,
-  labelPlacement: primitives.common.PlacementType.Top,
+  labelOrientation: TextOrientationType.Horizontal,
+  labelPlacement: PlacementType.Top,
   labelFontSize: '10px',
   labelFontFamily: 'Arial',
-  labelColor: primitives.common.Colors.Black,
+  labelColor: Colors.Black,
   labelFontWeight: 'normal',
   labelFontStyle: 'normal',
   enablePanning: true
@@ -214,7 +219,7 @@ function getNewChildItem(items = [], cursorItem = null, config = null) {
 }
 
 function getTree(items = []) {
-  const tree = primitives.common.tree();
+  const tree = Tree();
 
   // rebuild tree
   for (let index = 0; index < items.length; index += 1) {
@@ -227,7 +232,7 @@ function getTree(items = []) {
 
 function getDeletedItemsParent(tree, deletedItems, deletedHash) {
   let result = null;
-  const lca = primitives.common.LCA(tree);
+  const lca = LCA(tree);
   result = deletedItems.reduce((agg, itemid) => {
     if (agg == null) {
       agg = itemid;
diff --git a/client/src/redux/modules/demos/partners.js b/client/src/redux/modules/demos/partners.js
index fb57ce0..1345659 100644
--- a/client/src/redux/modules/demos/partners.js
+++ b/client/src/redux/modules/demos/partners.js
@@ -1,4 +1,8 @@
-const primitives = require('basicprimitives');
+import { OrgConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode} from 'basicprimitives';
 
 const LOAD = 'redux-example/partners/LOAD';
 const LOAD_SUCCESS = 'redux-example/partners/LOAD_SUCCESS';
@@ -32,56 +36,56 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.orgdiagram.Config(),
+    ...new OrgConfig(),
     cursorItem: 0,
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: 8,
-        minimizedItemSize: new primitives.common.Size(16, 16),
-        highlightPadding: new primitives.common.Thickness(6, 6, 6, 6),
-        minimizedItemShapeType: primitives.common.ShapeType.Rhombus,
+        minimizedItemSize: new Size(16, 16),
+        highlightPadding: new Thickness(6, 6, 6, 6),
+        minimizedItemShapeType: ShapeType.Rhombus,
         minimizedItemLineWidth: 0,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1
       },
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(220, 120)
+        itemSize: new Size(220, 120)
       }
     ],
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Top,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Top,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
     maximumColumnsInMatrix: 6,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.FullStack,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.FullStack,
 
-    hasButtons: primitives.common.Enabled.Auto,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    hasButtons: Enabled.Auto,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
@@ -95,31 +99,31 @@ const initialState = {
     cousinsIntervalMultiplier: 0,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.None,
+    arrowsDirection: GroupByType.None,
     showExtraArrows: true,
     extraArrowsMinimumSpace: 30,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.None,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.None,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Silver,
+    linesType: LineType.Solid,
+    linesColor: Colors.Silver,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.Auto,
-    labelSize: new primitives.common.Size(10, 14),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Bottom,
+    showLabels: Enabled.Auto,
+    labelSize: new Size(10, 14),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Bottom,
     labelOffset: 3,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -131,7 +135,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true,
 
@@ -172,14 +176,14 @@ function getCursorItem(config, cursorItem) {
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: primitives.common.Enabled.True
+            showCallout: Enabled.True
           };
         }
         if (item.templateName != null) {
           return {
             ...item,
             templateName: null,
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         return item;
diff --git a/client/src/redux/modules/demos/patents.js b/client/src/redux/modules/demos/patents.js
index 9502cc3..3264d98 100644
--- a/client/src/redux/modules/demos/patents.js
+++ b/client/src/redux/modules/demos/patents.js
@@ -1,4 +1,10 @@
-const primitives = require('basicprimitives');
+import { FamConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, NeighboursSelectionMode, LoopsLayoutMode,
+  AnnotationType, ZOrderType, ConnectorShapeType, ConnectorPlacementType, ConnectorLabelPlacementType,
+  PaletteItemConfig, HighlightPathAnnotationConfig, ConnectorAnnotationConfig } from 'basicprimitives';
 
 const LOAD = 'redux-example/patents/LOAD';
 const LOAD_SUCCESS = 'redux-example/patents/LOAD_SUCCESS';
@@ -31,96 +37,96 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.famdiagram.Config(),
+    ...new FamConfig(),
     defaultTemplateName: 'defaultTemplate',
     defaultCalloutTemplateName: 'contactTemplate',
     templates: [
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: 3,
-        minimizedItemSize: new primitives.common.Size(6, 6),
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(6, 6),
+        highlightPadding: new Thickness(2, 2, 2, 2),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 0,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0,
-        itemSize: new primitives.common.Size(160, 90)
+        itemSize: new Size(160, 90)
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'contactTemplate',
-        itemSize: new primitives.common.Size(160, 200)
+        itemSize: new Size(160, 200)
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'directTemplate',
-        itemSize: new primitives.common.Size(160, 180)
+        itemSize: new Size(160, 180)
       }
     ],
     linesPalette: [
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#C6C6C6', lineWidth: 1, lineType: primitives.common.LineType.Solid }), // 1
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#A5A5A5', lineWidth: 1, lineType: primitives.common.LineType.Dashed }), // 4
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#848484', lineWidth: 1, lineType: primitives.common.LineType.Solid }), // 7
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#646464', lineWidth: 1, lineType: primitives.common.LineType.Dashed }), // 10
-      new primitives.famdiagram.PaletteItemConfig({ lineColor: '#454545', lineWidth: 1, lineType: primitives.common.LineType.Solid }) // 13
+      new PaletteItemConfig({ lineColor: '#C6C6C6', lineWidth: 1, lineType: LineType.Solid }), // 1
+      new PaletteItemConfig({ lineColor: '#A5A5A5', lineWidth: 1, lineType: LineType.Dashed }), // 4
+      new PaletteItemConfig({ lineColor: '#848484', lineWidth: 1, lineType: LineType.Solid }), // 7
+      new PaletteItemConfig({ lineColor: '#646464', lineWidth: 1, lineType: LineType.Dashed }), // 10
+      new PaletteItemConfig({ lineColor: '#454545', lineWidth: 1, lineType: LineType.Solid }) // 13
     ],
     annotations: [
       {
-        annotationType: primitives.common.AnnotationType.Connector,
-        connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-        labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-        zOrderType: primitives.common.ZOrderType.Foreground,
+        annotationType: AnnotationType.Connector,
+        connectorPlacementType: ConnectorPlacementType.Offbeat,
+        labelPlacementType: ConnectorLabelPlacementType.Between,
+        zOrderType: ZOrderType.Foreground,
         fromItem: 5,
         toItem: 8,
         label: { color: "red", badge: "1", title: "Connector annotation" },
-        labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-        connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-        color: primitives.common.Colors.Red,
+        labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+        connectorShapeType: ConnectorShapeType.OneWay,
+        color: Colors.Red,
         offset: 5,
         lineWidth: 2,
-        lineType: primitives.common.LineType.Dashed
+        lineType: LineType.Dashed
       }
     ],
     cursorItem: 0,
     items: [],
 
     /* Layout */
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Top,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.FullStack,
-
-    hasButtons: primitives.common.Enabled.True,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Top,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.FullStack,
+
+    hasButtons: Enabled.True,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
     /* Family Diagram Specific Options */
-    neighboursSelectionMode: primitives.common.NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
-    groupByType: primitives.common.GroupByType.Children,
-    loopsLayoutMode: primitives.common.LoopsLayoutMode.Optimized,
+    neighboursSelectionMode: NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
+    groupByType: GroupByType.Children,
+    loopsLayoutMode: LoopsLayoutMode.Optimized,
     alignBylevels: true,
     hideGrandParentsConnectors: true,
     enableMatrixLayout: false,
@@ -137,31 +143,31 @@ const initialState = {
     cousinsIntervalMultiplier: 1,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.Parents,
+    arrowsDirection: GroupByType.Parents,
     showExtraArrows: true,
     extraArrowsMinimumSpace: 20,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.Round,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.Round,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Black,
+    linesType: LineType.Solid,
+    linesColor: Colors.Black,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.False,
-    labelSize: new primitives.common.Size(80, 24),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Top,
+    showLabels: Enabled.False,
+    labelSize: new Size(80, 24),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Top,
     labelOffset: 1,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -173,7 +179,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true
   },
@@ -223,7 +229,7 @@ function getCursorItem(config, children, parents, cursorItem) {
   const childrenItems = children[cursorItem] || [];
   const items = [...parentItems, ...childrenItems];
   let newAnnotations = annotations.reduce((agg, annotation) => {
-    if (annotation.annotationType !== primitives.common.AnnotationType.HighlightPath) {
+    if (annotation.annotationType !== AnnotationType.HighlightPath) {
       agg.push(annotation);
     }
     return agg;
@@ -232,12 +238,12 @@ function getCursorItem(config, children, parents, cursorItem) {
   if (cursorItem !== null) {
     newAnnotations = newAnnotations.concat(
       items.map(
-        id => new primitives.famdiagram.HighlightPathAnnotationConfig({
+        id => new HighlightPathAnnotationConfig({
           items: [cursorItem, id],
-          color: primitives.common.Colors.Navy,
+          color: Colors.Navy,
           opacity: 0.2,
           lineWidth: 16,
-          zOrderType: primitives.common.ZOrderType.Background,
+          zOrderType: ZOrderType.Background,
           showArrows: false
         })
       )
@@ -259,21 +265,21 @@ function getCursorItem(config, children, parents, cursorItem) {
           return {
             ...item,
             templateName: 'contactTemplate',
-            showCallout: primitives.common.Enabled.True
+            showCallout: Enabled.True
           };
         }
         if (directlyConnectedItems[item.id]) {
           return {
             ...item,
             templateName: 'directTemplate',
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         if (item.templateName != null) {
           return {
             ...item,
             templateName: null,
-            showCallout: primitives.common.Enabled.Auto
+            showCallout: Enabled.Auto
           };
         }
         return item;
@@ -289,7 +295,7 @@ function getAnnotations(config) {
     return {
       ...config,
       annotations: config.annotations.map(annotation => ({
-        ...new primitives.famdiagram.ConnectorAnnotationConfig(),
+        ...new ConnectorAnnotationConfig(),
         ...annotation
       }))
     };
@@ -454,7 +460,7 @@ export default function reducer(state = initialState, action = {}) {
         config: {
           ...restConfig,
           annotations: annotations.map(annotation => {
-            if (annotation.annotationType === primitives.common.AnnotationType.Connector) {
+            if (annotation.annotationType === AnnotationType.Connector) {
               const newAnnotation = { ...annotation };
               newAnnotation[action.option] = action.itemId;
               return newAnnotation;
diff --git a/client/src/redux/modules/demos/techtree.js b/client/src/redux/modules/demos/techtree.js
index 7c0e60e..34fdde0 100644
--- a/client/src/redux/modules/demos/techtree.js
+++ b/client/src/redux/modules/demos/techtree.js
@@ -1,4 +1,10 @@
-const primitives = require('basicprimitives');
+import { FamConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, NeighboursSelectionMode, LoopsLayoutMode,
+  AnnotationType, ZOrderType, ConnectorShapeType, ConnectorPlacementType,
+  ConnectorAnnotationConfig, ShapeType } from 'basicprimitives';
 
 const LOAD = 'redux-example/techtree/LOAD';
 const LOAD_SUCCESS = 'redux-example/techtree/LOAD_SUCCESS';
@@ -30,32 +36,32 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.famdiagram.Config(),
+    ...new FamConfig(),
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: 3,
-        minimizedItemSize: new primitives.common.Size(8, 8),
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(8, 8),
+        highlightPadding: new Thickness(2, 2, 2, 2),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 0,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0,
-        itemSize: new primitives.common.Size(164, 34)
+        itemSize: new Size(164, 34)
       },
       {
-        ...new primitives.famdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'dot',
         isActive: false,
-        itemSize: new primitives.common.Size(8, 8),
-        minimizedItemSize: new primitives.common.Size(8, 8),
+        itemSize: new Size(8, 8),
+        minimizedItemSize: new Size(8, 8),
         minimizedItemCornerRadius: 4,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null, // Shape border line has the same color as item title background color 
         minimizedItemFillColor: null, // Shape background has the same color as item title background color 
         minimizedItemOpacity: 0.7 // Shape background opacity
@@ -65,39 +71,39 @@ const initialState = {
     items: [],
 
     /* Layout */
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Left,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.FullStack,
-
-    hasButtons: primitives.common.Enabled.True,
-    hasSelectorCheckbox: primitives.common.Enabled.False,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Left,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Center,
+    childrenPlacementType: ChildrenPlacementType.Horizontal,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.FullStack,
+
+    hasButtons: Enabled.True,
+    hasSelectorCheckbox: Enabled.False,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
     /* Family Diagram Specific Options */
-    neighboursSelectionMode: primitives.common.NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
-    groupByType: primitives.common.GroupByType.Parents,
-    loopsLayoutMode: primitives.common.LoopsLayoutMode.Optimized,
+    neighboursSelectionMode: NeighboursSelectionMode.ParentsChildrenSiblingsAndSpouses,
+    groupByType: GroupByType.Parents,
+    loopsLayoutMode: LoopsLayoutMode.Optimized,
     alignBylevels: true,
     hideGrandParentsConnectors: false,
     enableMatrixLayout: false,
@@ -114,31 +120,31 @@ const initialState = {
     cousinsIntervalMultiplier: 1,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.Parents,
+    arrowsDirection: GroupByType.Parents,
     showExtraArrows: true,
     extraArrowsMinimumSpace: 20,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.Round,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.Round,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Black,
+    linesType: LineType.Solid,
+    linesColor: Colors.Black,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.False,
-    labelSize: new primitives.common.Size(80, 24),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Top,
+    showLabels: Enabled.False,
+    labelSize: new Size(80, 24),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Top,
     labelOffset: 1,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -150,7 +156,7 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true
   },
@@ -207,32 +213,32 @@ function getAnnotations(config) {
     for (var index = 0; index < items.length; index += 1) {
       var item = items[index];
       if (item.relativeItem != null) {
-        annotations.push(new primitives.famdiagram.ConnectorAnnotationConfig({
-          annotationType: primitives.common.AnnotationType.Connector,
+        annotations.push(new ConnectorAnnotationConfig({
+          annotationType: AnnotationType.Connector,
           fromItem: item.id,
           toItem: item.relativeItem,
           label: null,
-          connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-          color: primitives.common.Colors.Blue,
+          connectorShapeType: ConnectorShapeType.OneWay,
+          color: Colors.Blue,
           offset: -5,
           lineWidth: 3,
-          lineType: primitives.common.LineType.Dotted,
-          connectorPlacementType: primitives.common.ConnectorPlacementType.Straight,
+          lineType: LineType.Dotted,
+          connectorPlacementType: ConnectorPlacementType.Straight,
           selectItems: false
         }));
       }
       if (item.primaryParent != null) {
-        annotations.push(new primitives.famdiagram.ConnectorAnnotationConfig({
-          annotationType: primitives.common.AnnotationType.Connector,
+        annotations.push(new ConnectorAnnotationConfig({
+          annotationType: AnnotationType.Connector,
           fromItem: item.id,
           toItem: item.primaryParent,
           label: null,
-          connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-          color: primitives.common.Colors.Red,
+          connectorShapeType: ConnectorShapeType.OneWay,
+          color: Colors.Red,
           offset: -5,
           lineWidth: 3,
-          lineType: primitives.common.LineType.Dotted,
-          connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
+          lineType: LineType.Dotted,
+          connectorPlacementType: ConnectorPlacementType.Offbeat,
           selectItems: false
         }));
       }
@@ -375,7 +381,7 @@ export default function reducer(state = initialState, action = {}) {
       const childItems = children[cursorItem] || [];
 
       let newAnnotations = annotations.reduce((agg, annotation) => {
-        if (annotation.annotationType !== primitives.common.AnnotationType.HighlightPath) {
+        if (annotation.annotationType !== AnnotationType.HighlightPath) {
           agg.push(annotation);
         }
         return agg;
@@ -386,12 +392,12 @@ export default function reducer(state = initialState, action = {}) {
         newAnnotations = newAnnotations.concat(
           items.map(
             itemid => ({
-              annotationType: primitives.common.AnnotationType.HighlightPath,
+              annotationType: AnnotationType.HighlightPath,
               items: [cursorItem, itemid],
-              color: primitives.common.Colors.Navy,
+              color: Colors.Navy,
               opacity: 0.2,
               lineWidth: 16,
-              zOrderType: primitives.common.ZOrderType.Background,
+              zOrderType: ZOrderType.Background,
               showArrows: false
             })
           )
diff --git a/client/src/redux/modules/demos/verticallayoutorganizationalchart.js b/client/src/redux/modules/demos/verticallayoutorganizationalchart.js
index b641005..1310484 100644
--- a/client/src/redux/modules/demos/verticallayoutorganizationalchart.js
+++ b/client/src/redux/modules/demos/verticallayoutorganizationalchart.js
@@ -1,4 +1,8 @@
-const primitives = require('basicprimitives');
+import { OrgConfig, TemplateConfig, Size, Thickness, PageFitMode,
+  Enabled, ShapeType, LineType, OrientationType, VerticalAlignmentType, HorizontalAlignmentType,
+  ChildrenPlacementType, Visibility, SelectionPathMode, Colors,
+  AdviserPlacementType, TextOrientationType, GroupByType, ConnectorType,
+  ElbowType, PlacementType, NavigationMode, GraphicsType, ItemType} from 'basicprimitives';
 
 const LOAD = 'redux-example/verticallayoutorganizationalchart/LOAD';
 const LOAD_SUCCESS = 'redux-example/verticallayoutorganizationalchart/LOAD_SUCCESS';
@@ -33,58 +37,58 @@ const initialState = {
   },
   centerOnCursor: true,
   config: {
-    ...new primitives.orgdiagram.Config(),
+    ...new OrgConfig(),
     cursorItem: 0,
     items: [],
     defaultTemplateName: 'defaultTemplate',
     templates: [
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'defaultTemplate',
         minimizedItemCornerRadius: null,
-        minimizedItemSize: new primitives.common.Size(4, 4),
-        highlightPadding: new primitives.common.Thickness(2, 2, 2, 2),
-        minimizedItemShapeType: primitives.common.ShapeType.None,
+        minimizedItemSize: new Size(4, 4),
+        highlightPadding: new Thickness(2, 2, 2, 2),
+        minimizedItemShapeType: ShapeType.None,
         minimizedItemLineWidth: 1,
-        minimizedItemLineType: primitives.common.LineType.Solid,
+        minimizedItemLineType: LineType.Solid,
         minimizedItemBorderColor: null,
         minimizedItemFillColor: null,
         minimizedItemOpacity: 1.0
       },
       {
-        ...new primitives.orgdiagram.TemplateConfig(),
+        ...new TemplateConfig(),
         name: 'managerTemplate',
-        itemSize: new primitives.common.Size(220, 120)
+        itemSize: new Size(220, 120)
       }
     ],
     /* Layout */
-    pageFitMode: primitives.common.PageFitMode.FitToPage,
-    orientationType: primitives.common.OrientationType.Top,
-    verticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    horizontalAlignment: primitives.common.HorizontalAlignmentType.Left,
-    childrenPlacementType: primitives.common.ChildrenPlacementType.Vertical,
-    leavesPlacementType: primitives.common.ChildrenPlacementType.Horizontal,
+    pageFitMode: PageFitMode.FitToPage,
+    orientationType: OrientationType.Top,
+    verticalAlignment: VerticalAlignmentType.Middle,
+    horizontalAlignment: HorizontalAlignmentType.Left,
+    childrenPlacementType: ChildrenPlacementType.Vertical,
+    leavesPlacementType: ChildrenPlacementType.Horizontal,
     maximumColumnsInMatrix: 6,
-    minimalVisibility: primitives.common.Visibility.Dot,
-    selectionPathMode: primitives.common.SelectionPathMode.FullStack,
+    minimalVisibility: Visibility.Dot,
+    selectionPathMode: SelectionPathMode.FullStack,
 
-    hasButtons: primitives.common.Enabled.Auto,
-    hasSelectorCheckbox: primitives.common.Enabled.True,
+    hasButtons: Enabled.Auto,
+    hasSelectorCheckbox: Enabled.True,
     selectCheckBoxLabel: 'Selected',
-    itemTitleFirstFontColor: primitives.common.Colors.White,
-    itemTitleSecondFontColor: primitives.common.Colors.White,
+    itemTitleFirstFontColor: Colors.White,
+    itemTitleSecondFontColor: Colors.White,
     buttonsPanelSize: 42,
     groupTitlePanelSize: 24,
     checkBoxPanelSize: 24,
 
     /* group title options */
-    groupTitlePlacementType: primitives.common.AdviserPlacementType.Left,
-    groupTitleOrientation: primitives.text.TextOrientationType.RotateRight,
-    groupTitleVerticalAlignment: primitives.common.VerticalAlignmentType.Middle,
-    groupTitleHorizontalAlignment: primitives.common.HorizontalAlignmentType.Center,
+    groupTitlePlacementType: AdviserPlacementType.Left,
+    groupTitleOrientation: TextOrientationType.RotateRight,
+    groupTitleVerticalAlignment: VerticalAlignmentType.Middle,
+    groupTitleHorizontalAlignment: HorizontalAlignmentType.Center,
     groupTitleFontSize: '12px',
     groupTitleFontFamily: 'Arial',
-    groupTitleColor: primitives.common.Colors.RoyalBlue,
+    groupTitleColor: Colors.RoyalBlue,
     groupTitleFontWeight: 'normal',
     groupTitleFontStyle: 'normal',
 
@@ -98,31 +102,31 @@ const initialState = {
     cousinsIntervalMultiplier: 0,
 
     /* Connectors */
-    arrowsDirection: primitives.common.GroupByType.None,
+    arrowsDirection: GroupByType.None,
     showExtraArrows: false,
     extraArrowsMinimumSpace: 30,
-    connectorType: primitives.common.ConnectorType.Squared,
-    elbowType: primitives.common.ElbowType.None,
+    connectorType: ConnectorType.Squared,
+    elbowType: ElbowType.None,
     bevelSize: 4,
     elbowDotSize: 4,
-    linesType: primitives.common.LineType.Solid,
-    linesColor: primitives.common.Colors.Silver,
+    linesType: LineType.Solid,
+    linesColor: Colors.Silver,
     linesWidth: 1,
 
     /* Labels */
-    showLabels: primitives.common.Enabled.Auto,
-    labelSize: new primitives.common.Size(10, 14),
-    labelOrientation: primitives.text.TextOrientationType.Horizontal,
-    labelPlacement: primitives.common.PlacementType.Bottom,
+    showLabels: Enabled.Auto,
+    labelSize: new Size(10, 14),
+    labelOrientation: TextOrientationType.Horizontal,
+    labelPlacement: PlacementType.Bottom,
     labelOffset: 3,
     labelFontSize: '10px',
     labelFontFamily: 'Arial',
-    labelColor: primitives.common.Colors.Black,
+    labelColor: Colors.Black,
     labelFontWeight: 'normal',
     labelFontStyle: 'normal',
 
     /* Callout */
-    calloutMaximumVisibility: primitives.common.Visibility.Dot,
+    calloutMaximumVisibility: Visibility.Dot,
     showCallout: true,
     calloutPlacementOffset: 100,
     calloutfillColor: '#000000',
@@ -134,12 +138,12 @@ const initialState = {
     calloutOpacity: 0.2,
 
     /* Interactivity */
-    navigationMode: primitives.common.NavigationMode.Default,
+    navigationMode: NavigationMode.Default,
     highlightGravityRadius: 40,
     enablePanning: true,
 
     /* Graphics */
-    graphicsType: primitives.common.GraphicsType.SVG,
+    graphicsType: GraphicsType.SVG,
 
     scale: 1.0
   },
@@ -254,17 +258,17 @@ export default function reducer(state = initialState, action = {}) {
 
     case SWITCHLTR: {
       const { config } = state;
-      const isLTR = config.horizontalAlignment === primitives.common.HorizontalAlignmentType.Left;
+      const isLTR = config.horizontalAlignment === HorizontalAlignmentType.Left;
       const newConfig = { ...config };
       const { items } = newConfig;
-      newConfig["horizontalAlignment"] = isLTR ? primitives.common.HorizontalAlignmentType.Right : primitives.common.HorizontalAlignmentType.Left;
-      newConfig["groupTitlePlacementType"] = isLTR ? primitives.common.AdviserPlacementType.Right : primitives.common.AdviserPlacementType.Left;
-      newConfig["groupTitleOrientation"] = isLTR ? primitives.text.TextOrientationType.RotateLeft : primitives.text.TextOrientationType.RotateRight;
+      newConfig["horizontalAlignment"] = isLTR ? HorizontalAlignmentType.Right : HorizontalAlignmentType.Left;
+      newConfig["groupTitlePlacementType"] = isLTR ? AdviserPlacementType.Right : AdviserPlacementType.Left;
+      newConfig["groupTitleOrientation"] = isLTR ? TextOrientationType.RotateLeft : TextOrientationType.RotateRight;
       
       newConfig.items = items.map(item => {
-        if (item.itemType === primitives.orgdiagram.ItemType.Adviser || item.itemType === primitives.orgdiagram.ItemType.Assistant) {
+        if (item.itemType === ItemType.Adviser || item.itemType === ItemType.Assistant) {
           const newItem = { ...item };
-          newItem["adviserPlacementType"] = isLTR ? primitives.common.AdviserPlacementType.Left : primitives.common.AdviserPlacementType.Right;
+          newItem["adviserPlacementType"] = isLTR ? AdviserPlacementType.Left : AdviserPlacementType.Right;
           return newItem;
         }
         return item;
diff --git a/client/src/redux/modules/pages.js b/client/src/redux/modules/pages.js
index d370465..7bbc271 100644
--- a/client/src/redux/modules/pages.js
+++ b/client/src/redux/modules/pages.js
@@ -220,7 +220,7 @@ export function load() {
       client.get('/load-markdown?name=javascript-readme'), 
       client.get('/load-markdown?name=react-readme'),
       client.get('/load-markdown?name=reference-readme'),
-      client.get('/min/package.json')
+      client.get('/javascript/package.json')
     ]).then(results => ({
       javascript: results[0],
       react: results[1],
diff --git a/client/yarn.lock b/client/yarn.lock
index feb9610..ebb5de6 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -2,13 +2,20 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.10.4", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
   integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.5.5":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
@@ -37,42 +44,41 @@
     source-map "^0.5.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4", "@babel/core@^7.9.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.7.tgz#bf55363c08c8352a37691f7216ec30090bf7e3bf"
-  integrity sha512-tRKx9B53kJe8NCGGIxEQb2Bkr0riUIEuN7Sc1fxhs5H8lKlCWUvQCSNMVIB0Meva7hcbCRJ76de15KoLltdoqw==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
+    "@babel/generator" "^7.12.10"
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helpers" "^7.12.5"
-    "@babel/parser" "^7.12.7"
+    "@babel/parser" "^7.12.10"
     "@babel/template" "^7.12.7"
-    "@babel/traverse" "^7.12.7"
-    "@babel/types" "^7.12.7"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.10"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
     lodash "^4.17.19"
-    resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1", "@babel/generator@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
-  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
+"@babel/generator@^7.12.1", "@babel/generator@^7.12.10":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af"
+  integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==
   dependencies:
-    "@babel/types" "^7.12.5"
+    "@babel/types" "^7.12.11"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
-  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
+"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
+  integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
   version "7.10.4"
@@ -82,14 +88,14 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-react-jsx-experimental@^7.12.4":
-  version "7.12.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
-  integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==
+"@babel/helper-builder-react-jsx-experimental@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.11.tgz#a39616d7e4cf8f9da1f82b5fc3ee1f7406beeb11"
+  integrity sha512-4oGVOekPI8dh9JphkPXC68iIuP6qp/RPbaPmorRmEFbRAHZjSqxPjqHudn18GVDPgCuFM/KdFXc63C17Ygfa9w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/helper-annotate-as-pure" "^7.12.10"
+    "@babel/helper-module-imports" "^7.12.5"
+    "@babel/types" "^7.12.11"
 
 "@babel/helper-builder-react-jsx@^7.10.4":
   version "7.10.4"
@@ -145,20 +151,20 @@
     "@babel/types" "^7.12.1"
 
 "@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
-  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42"
+  integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/helper-get-function-arity" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+"@babel/helper-get-function-arity@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
@@ -167,7 +173,7 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.12.1":
+"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
   integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
@@ -196,12 +202,12 @@
     "@babel/types" "^7.12.1"
     lodash "^4.17.19"
 
-"@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
-  integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
+"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
+  integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
   dependencies:
-    "@babel/types" "^7.12.7"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
@@ -218,14 +224,14 @@
     "@babel/types" "^7.12.1"
 
 "@babel/helper-replace-supers@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
-  integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d"
+  integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.12.1"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.12.5"
-    "@babel/types" "^7.12.5"
+    "@babel/helper-member-expression-to-functions" "^7.12.7"
+    "@babel/helper-optimise-call-expression" "^7.12.10"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.11"
 
 "@babel/helper-simple-access@^7.12.1":
   version "7.12.1"
@@ -242,21 +248,21 @@
     "@babel/types" "^7.12.1"
 
 "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a"
+  integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
 
-"@babel/helper-validator-option@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
-  integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==
+"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f"
+  integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==
 
 "@babel/helper-wrap-function@^7.10.4":
   version "7.12.3"
@@ -286,10 +292,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
-  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
+  integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
 
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
@@ -573,10 +579,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
-  integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.11.tgz#83ae92a104dbb93a7d6c6dd1844f351083c46b4f"
+  integrity sha512-atR1Rxc3hM+VPg/NvNvfYw0npQEAcHuJ+MGZnFn6h3bo+1U3BWXMdFMlvVRApBTWKQMX7SOwRJZA5FBF/JQbvA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
@@ -757,11 +763,11 @@
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-development@^7.12.1", "@babel/plugin-transform-react-jsx-development@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08"
-  integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.11.tgz#078aa7e1f5f75a68ee9598ebed90000fcb11092f"
+  integrity sha512-5MvsGschXeXJsbzQGR/BH89ATMzCsM7rx95n+R7/852cGoK2JgMbacDw/A9Pmrfex4tArdMab0L5SBV4SB/Nxg==
   dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
+    "@babel/helper-builder-react-jsx-experimental" "^7.12.11"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
@@ -779,13 +785,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"
-  integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==
+"@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.12.10":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.11.tgz#09a7319195946b0ddc09f9a5f01346f2cb80dfdd"
+  integrity sha512-5nWOw6mTylaFU72BdZfa0dP1HsGdY3IMExpxn8LBE8dNmkQjB+W+sR+JwIdtbzkPvVuFviT3zyNbSUkuVTVxbw==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
-    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
+    "@babel/helper-builder-react-jsx-experimental" "^7.12.11"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
@@ -850,10 +856,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
-  integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==
+"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
+  integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
@@ -954,15 +960,15 @@
     semver "^5.5.0"
 
 "@babel/preset-env@^7.8.4", "@babel/preset-env@^7.9.5":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
-  integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9"
+  integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==
   dependencies:
     "@babel/compat-data" "^7.12.7"
     "@babel/helper-compilation-targets" "^7.12.5"
     "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-option" "^7.12.1"
+    "@babel/helper-validator-option" "^7.12.11"
     "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
     "@babel/plugin-proposal-class-properties" "^7.12.1"
     "@babel/plugin-proposal-dynamic-import" "^7.12.1"
@@ -991,7 +997,7 @@
     "@babel/plugin-transform-arrow-functions" "^7.12.1"
     "@babel/plugin-transform-async-to-generator" "^7.12.1"
     "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.11"
     "@babel/plugin-transform-classes" "^7.12.1"
     "@babel/plugin-transform-computed-properties" "^7.12.1"
     "@babel/plugin-transform-destructuring" "^7.12.1"
@@ -1017,12 +1023,12 @@
     "@babel/plugin-transform-spread" "^7.12.1"
     "@babel/plugin-transform-sticky-regex" "^7.12.7"
     "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.12.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.10"
     "@babel/plugin-transform-unicode-escapes" "^7.12.1"
     "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.7"
-    core-js-compat "^3.7.0"
+    "@babel/types" "^7.12.11"
+    core-js-compat "^3.8.0"
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
@@ -1050,16 +1056,14 @@
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
 "@babel/preset-react@^7.9.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b"
-  integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9"
+  integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-react-display-name" "^7.12.1"
-    "@babel/plugin-transform-react-jsx" "^7.12.7"
+    "@babel/plugin-transform-react-jsx" "^7.12.10"
     "@babel/plugin-transform-react-jsx-development" "^7.12.7"
-    "@babel/plugin-transform-react-jsx-self" "^7.12.1"
-    "@babel/plugin-transform-react-jsx-source" "^7.12.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
 "@babel/preset-typescript@7.12.1":
@@ -1101,27 +1105,27 @@
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.7", "@babel/traverse@^7.7.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.7.tgz#572a722408681cef17d6b0bef69ef2e728ca69f1"
-  integrity sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"
+  integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
+    "@babel/generator" "^7.12.10"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
+    "@babel/parser" "^7.12.10"
+    "@babel/types" "^7.12.10"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
-  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce"
+  integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.12.11"
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
@@ -1153,10 +1157,10 @@
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@eslint/eslintrc@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
-  integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==
+"@eslint/eslintrc@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
+  integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
@@ -1189,9 +1193,9 @@
     "@fortawesome/fontawesome-common-types" "^0.2.32"
 
 "@fortawesome/react-fontawesome@^0.1.12":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.12.tgz#fbdea86e8b73032895e6ded1ee1dbb1874902d1a"
-  integrity sha512-kV6HtqotM3K4YIXlTVvomuIi6QgGCvYm++ImyEx2wwgmSppZ6kbbA29ASwjAUBD63j2OFU0yoxeXpZkjrrX0qQ==
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.13.tgz#ce9654bf4e537108014ec022f2423dbe8114fd62"
+  integrity sha512-/HrLnIft5Ks2511Pz6TxHBIctC9QalVscAC64sufQ4sJH/sXaQlG3uR9LCu6VpEwkBemgcBLrz/QPNP/ddbjDg==
   dependencies:
     prop-types "^15.7.2"
 
@@ -1415,50 +1419,50 @@
     chalk "^4.0.0"
 
 "@material-ui/core@^4.11.0":
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a"
-  integrity sha512-bYo9uIub8wGhZySHqLQ833zi4ZML+XCBE1XwJ8EuUVSpTWWG57Pm+YugQToJNFsEyiKFhPh8DPD0bgupz8n01g==
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.2.tgz#f8276dfa40d88304e6ceb98962af73803d27d42d"
+  integrity sha512-/D1+AQQeYX/WhT/FUk78UCRj8ch/RCglsQLYujYTIqPSJlwZHKcvHidNeVhODXeApojeXjkl0tWdk5C9ofwOkQ==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/styles" "^4.10.0"
-    "@material-ui/system" "^4.9.14"
+    "@material-ui/styles" "^4.11.2"
+    "@material-ui/system" "^4.11.2"
     "@material-ui/types" "^5.1.0"
-    "@material-ui/utils" "^4.10.2"
+    "@material-ui/utils" "^4.11.2"
     "@types/react-transition-group" "^4.2.0"
     clsx "^1.0.4"
     hoist-non-react-statics "^3.3.2"
     popper.js "1.16.1-lts"
     prop-types "^15.7.2"
-    react-is "^16.8.0"
+    react-is "^16.8.0 || ^17.0.0"
     react-transition-group "^4.4.0"
 
 "@material-ui/icons@^4.9.1":
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.9.1.tgz#fdeadf8cb3d89208945b33dbc50c7c616d0bd665"
-  integrity sha512-GBitL3oBWO0hzBhvA9KxqcowRUsA0qzwKkURyC8nppnC3fw54KPKZ+d4V1Eeg/UnDRSzDaI9nGCdel/eh9AQMg==
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.2.tgz#b3a7353266519cd743b6461ae9fdfcb1b25eb4c5"
+  integrity sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==
   dependencies:
     "@babel/runtime" "^7.4.4"
 
 "@material-ui/lab@^4.0.0-alpha.56":
-  version "4.0.0-alpha.56"
-  resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.56.tgz#ff63080949b55b40625e056bbda05e130d216d34"
-  integrity sha512-xPlkK+z/6y/24ka4gVJgwPfoCF4RCh8dXb1BNE7MtF9bXEBLN/lBxNTK8VAa0qm3V2oinA6xtUIdcRh0aeRtVw==
+  version "4.0.0-alpha.57"
+  resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.57.tgz#e8961bcf6449e8a8dabe84f2700daacfcafbf83a"
+  integrity sha512-qo/IuIQOmEKtzmRD2E4Aa6DB4A87kmY6h0uYhjUmrrgmEAgbbw9etXpWPVXuRK6AGIQCjFzV6WO2i21m1R4FCw==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.10.2"
+    "@material-ui/utils" "^4.11.2"
     clsx "^1.0.4"
     prop-types "^15.7.2"
-    react-is "^16.8.0"
+    react-is "^16.8.0 || ^17.0.0"
 
-"@material-ui/styles@^4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz#2406dc23aa358217aa8cc772e6237bd7f0544071"
-  integrity sha512-XPwiVTpd3rlnbfrgtEJ1eJJdFCXZkHxy8TrdieaTvwxNYj42VnnCyFzxYeNW9Lhj4V1oD8YtQ6S5Gie7bZDf7Q==
+"@material-ui/styles@^4.10.0", "@material-ui/styles@^4.11.2":
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.2.tgz#e70558be3f41719e8c0d63c7a3c9ae163fdc84cb"
+  integrity sha512-xbItf8zkfD3FuGoD9f2vlcyPf9jTEtj9YTJoNNV+NMWaSAHXgrW6geqRoo/IwBuMjqpwqsZhct13e2nUyU9Ljw==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/hash" "^0.8.0"
     "@material-ui/types" "^5.1.0"
-    "@material-ui/utils" "^4.9.6"
+    "@material-ui/utils" "^4.11.2"
     clsx "^1.0.4"
     csstype "^2.5.2"
     hoist-non-react-statics "^3.3.2"
@@ -1472,13 +1476,13 @@
     jss-plugin-vendor-prefixer "^10.0.3"
     prop-types "^15.7.2"
 
-"@material-ui/system@^4.9.14":
-  version "4.9.14"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f"
-  integrity sha512-oQbaqfSnNlEkXEziDcJDDIy8pbvwUmZXWNqlmIwDqr/ZdCK8FuV3f4nxikUh7hvClKV2gnQ9djh5CZFTHkZj3w==
+"@material-ui/system@^4.11.2":
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.11.2.tgz#7f0a754bba3673ed5fdbfa02fe438096c104b1f6"
+  integrity sha512-BELFJEel5E+5DMiZb6XXT3peWRn6UixRvBtKwSxqntmD0+zwbbfCij6jtGwwdJhN1qX/aXrKu10zX31GBaeR7A==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.9.6"
+    "@material-ui/utils" "^4.11.2"
     csstype "^2.5.2"
     prop-types "^15.7.2"
 
@@ -1487,14 +1491,14 @@
   resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
   integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
 
-"@material-ui/utils@^4.10.2", "@material-ui/utils@^4.9.6":
-  version "4.10.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.10.2.tgz#3fd5470ca61b7341f1e0468ac8f29a70bf6df321"
-  integrity sha512-eg29v74P7W5r6a4tWWDAAfZldXIzfyO1am2fIsC39hdUUHm/33k6pGOKPbgDjg/U/4ifmgAePy/1OjkKN6rFRw==
+"@material-ui/utils@^4.11.2":
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz#f1aefa7e7dff2ebcb97d31de51aecab1bb57540a"
+  integrity sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==
   dependencies:
     "@babel/runtime" "^7.4.4"
     prop-types "^15.7.2"
-    react-is "^16.8.0"
+    react-is "^16.8.0 || ^17.0.0"
 
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
@@ -1715,9 +1719,9 @@
     loader-utils "^2.0.0"
 
 "@testing-library/dom@^7.28.1":
-  version "7.28.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.28.1.tgz#dea78be6e1e6db32ddcb29a449e94d9700c79eb9"
-  integrity sha512-acv3l6kDwZkQif/YqJjstT3ks5aaI33uxGNVIQmdKzbZ2eMKgg3EV2tB84GDdc72k3Kjhl6mO8yUt6StVIdRDg==
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.29.0.tgz#60b18065bab50a5cde21fe80275a47a43024d9cc"
+  integrity sha512-0hhuJSmw/zLc6ewR9cVm84TehuTd7tbqBX9pRNSp8znJ9gTmSgesdbiGZtt8R6dL+2rgaPFp9Yjr7IU1HWm49w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
@@ -1751,11 +1755,11 @@
     "@testing-library/dom" "^7.28.1"
 
 "@testing-library/user-event@^12.1.10":
-  version "12.2.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.2.2.tgz#22d0047da745289335240f523dfe74c889ec96cb"
-  integrity sha512-mTYL9LrwiSeyorStUOMuRGQDn1ca40tIhuv//o/K3lY8wBEp+9Im90MFVx5i3u7zCPmavn3uWZs/10chsbI8Tg==
+  version "12.6.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.6.0.tgz#2d0229e399eb5a0c6c112e848611432356cac886"
+  integrity sha512-FNEH/HLmOk5GO70I52tKjs7WvGYckeE/SrnLX/ip7z2IGbffyd5zOUM1tZ10vsTphqm+VbDFI0oaXu0wcfQsAQ==
   dependencies:
-    "@babel/runtime" "^7.10.2"
+    "@babel/runtime" "^7.12.5"
 
 "@types/anymatch@*":
   version "1.3.1"
@@ -1794,16 +1798,16 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
-  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
+  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
   dependencies:
     "@babel/types" "^7.3.0"
 
 "@types/eslint@^7.2.4":
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.5.tgz#92172ecf490c2fce4b076739693d75f30376d610"
-  integrity sha512-Dc6ar9x16BdaR3NSxSF7T4IjL9gxxViJq8RmFd+2UAyA+K6ck2W+gUwfgpG/y9TPyUuBL35109bbULpEynvltA==
+  version "7.2.6"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c"
+  integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
@@ -1880,9 +1884,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@*":
-  version "26.0.15"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz#12e02c0372ad0548e07b9f4e19132b834cb1effe"
-  integrity sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==
+  version "26.0.19"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790"
+  integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
@@ -1903,9 +1907,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "14.14.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.9.tgz#04afc9a25c6ff93da14deabd65dc44485b53c8d6"
-  integrity sha512-JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw==
+  version "14.14.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae"
+  integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1989,9 +1993,9 @@
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
 "@types/webpack-sources@*":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7"
-  integrity sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"
+  integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -2015,34 +2019,34 @@
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^15.0.0":
-  version "15.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz#0fe3c8173a0d5c3e780b389050140c3f5ea6ea74"
-  integrity sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==
+  version "15.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
+  integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^4.5.0":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.8.1.tgz#b362abe0ee478a6c6d06c14552a6497f0b480769"
-  integrity sha512-d7LeQ7dbUrIv5YVFNzGgaW3IQKMmnmKFneRWagRlGYOSfLJVaRbj/FrBNOBC1a3tVO+TgNq1GbHvRtg1kwL0FQ==
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.10.0.tgz#19ed3baf4bc4232c5a7fcd32eaca75c3a5baf9f3"
+  integrity sha512-h6/V46o6aXpKRlarP1AiJEXuCJ7cMQdlpfMDrcllIgX3dFkLwEBTXAoNP98ZoOmqd1xvymMVRAI4e7yVvlzWEg==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.8.1"
-    "@typescript-eslint/scope-manager" "4.8.1"
+    "@typescript-eslint/experimental-utils" "4.10.0"
+    "@typescript-eslint/scope-manager" "4.10.0"
     debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@4.8.1", "@typescript-eslint/experimental-utils@^4.0.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.1.tgz#27275c20fa4336df99ebcf6195f7d7aa7aa9f22d"
-  integrity sha512-WigyLn144R3+lGATXW4nNcDJ9JlTkG8YdBWHkDlN0lC3gUGtDi7Pe3h5GPvFKMcRz8KbZpm9FJV9NTW8CpRHpg==
+"@typescript-eslint/experimental-utils@4.10.0", "@typescript-eslint/experimental-utils@^4.0.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.10.0.tgz#dbf5d0f89802d5feaf7d11e5b32df29bbc2f3a0e"
+  integrity sha512-opX+7ai1sdWBOIoBgpVJrH5e89ra1KoLrJTz0UtWAa4IekkKmqDosk5r6xqRaNJfCXEfteW4HXQAwMdx+jjEmw==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.8.1"
-    "@typescript-eslint/types" "4.8.1"
-    "@typescript-eslint/typescript-estree" "4.8.1"
+    "@typescript-eslint/scope-manager" "4.10.0"
+    "@typescript-eslint/types" "4.10.0"
+    "@typescript-eslint/typescript-estree" "4.10.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
@@ -2058,32 +2062,32 @@
     eslint-utils "^2.0.0"
 
 "@typescript-eslint/parser@^4.5.0":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.8.1.tgz#4fe2fbdbb67485bafc4320b3ae91e34efe1219d1"
-  integrity sha512-QND8XSVetATHK9y2Ltc/XBl5Ro7Y62YuZKnPEwnNPB8E379fDsvzJ1dMJ46fg/VOmk0hXhatc+GXs5MaXuL5Uw==
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.10.0.tgz#1a622b0847b765b2d8f0ede6f0cdd85f03d76031"
+  integrity sha512-amBvUUGBMadzCW6c/qaZmfr3t9PyevcSWw7hY2FuevdZVp5QPw/K76VSQ5Sw3BxlgYCHZcK6DjIhSZK0PQNsQg==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.8.1"
-    "@typescript-eslint/types" "4.8.1"
-    "@typescript-eslint/typescript-estree" "4.8.1"
+    "@typescript-eslint/scope-manager" "4.10.0"
+    "@typescript-eslint/types" "4.10.0"
+    "@typescript-eslint/typescript-estree" "4.10.0"
     debug "^4.1.1"
 
-"@typescript-eslint/scope-manager@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.8.1.tgz#e343c475f8f1d15801b546cb17d7f309b768fdce"
-  integrity sha512-r0iUOc41KFFbZdPAdCS4K1mXivnSZqXS5D9oW+iykQsRlTbQRfuFRSW20xKDdYiaCoH+SkSLeIF484g3kWzwOQ==
+"@typescript-eslint/scope-manager@4.10.0":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.10.0.tgz#dbd7e1fc63d7363e3aaff742a6f2b8afdbac9d27"
+  integrity sha512-WAPVw35P+fcnOa8DEic0tQUhoJJsgt+g6DEcz257G7vHFMwmag58EfowdVbiNcdfcV27EFR0tUBVXkDoIvfisQ==
   dependencies:
-    "@typescript-eslint/types" "4.8.1"
-    "@typescript-eslint/visitor-keys" "4.8.1"
+    "@typescript-eslint/types" "4.10.0"
+    "@typescript-eslint/visitor-keys" "4.10.0"
 
 "@typescript-eslint/types@3.10.1":
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
   integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
 
-"@typescript-eslint/types@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.1.tgz#23829c73c5fc6f4fcd5346a7780b274f72fee222"
-  integrity sha512-ave2a18x2Y25q5K05K/U3JQIe2Av4+TNi/2YuzyaXLAsDx6UZkz1boZ7nR/N6Wwae2PpudTZmHFXqu7faXfHmA==
+"@typescript-eslint/types@4.10.0":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789"
+  integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g==
 
 "@typescript-eslint/typescript-estree@3.10.1":
   version "3.10.1"
@@ -2099,13 +2103,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.1.tgz#7307e3f2c9e95df7daa8dc0a34b8c43b7ec0dd32"
-  integrity sha512-bJ6Fn/6tW2g7WIkCWh3QRlaSU7CdUUK52shx36/J7T5oTQzANvi6raoTsbwGM11+7eBbeem8hCCKbyvAc0X3sQ==
+"@typescript-eslint/typescript-estree@4.10.0":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.10.0.tgz#1e62e45fd57866afd42daf5e9fb6bd4e8dbcfa75"
+  integrity sha512-mGK0YRp9TOk6ZqZ98F++bW6X5kMTzCRROJkGXH62d2azhghmq+1LNLylkGe6uGUOQzD452NOAEth5VAF6PDo5g==
   dependencies:
-    "@typescript-eslint/types" "4.8.1"
-    "@typescript-eslint/visitor-keys" "4.8.1"
+    "@typescript-eslint/types" "4.10.0"
+    "@typescript-eslint/visitor-keys" "4.10.0"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -2120,12 +2124,12 @@
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/visitor-keys@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.1.tgz#794f68ee292d1b2e3aa9690ebedfcb3a8c90e3c3"
-  integrity sha512-3nrwXFdEYALQh/zW8rFwP4QltqsanCDz4CwWMPiIZmwlk9GlvBeueEIbq05SEq4ganqM0g9nh02xXgv5XI3PeQ==
+"@typescript-eslint/visitor-keys@4.10.0":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.10.0.tgz#9478822329a9bc8ebcc80623d7f79a01da5ee451"
+  integrity sha512-hPyz5qmDMuZWFtHZkjcCpkAKHX8vdu1G3YsCLEd25ryZgnJfj6FQuJ5/O7R+dB1ueszilJmAFMtlU4CA6se3Jg==
   dependencies:
-    "@typescript-eslint/types" "4.8.1"
+    "@typescript-eslint/types" "4.10.0"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.0":
@@ -2309,7 +2313,7 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.2.0:
+acorn-jsx@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
@@ -2521,12 +2525,14 @@ array-flatten@^2.1.0:
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
 array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
+  integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
+    es-abstract "^1.18.0-next.1"
+    get-intrinsic "^1.0.1"
     is-string "^1.0.5"
 
 array-union@^1.0.1:
@@ -2812,9 +2818,9 @@ babel-plugin-transform-react-remove-prop-types@0.4.24:
   integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
 
 babel-preset-current-node-syntax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77"
-  integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -2894,17 +2900,17 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
-basicprimitives@5.9.2, basicprimitives@^5.9.2:
-  version "5.9.2"
-  resolved "https://registry.yarnpkg.com/basicprimitives/-/basicprimitives-5.9.2.tgz#1037f6a4e936c7fe15556900e891500fc2bde32d"
-  integrity sha512-bH48OPScxPdsVhI6ZBncgpAwRCt4qrx1r+lpcmpp4is6F1RpsGRF+maq2FbaI4LglaTxrcTsZ7dEEMYhy12YSg==
+basicprimitives@6.0.3, basicprimitives@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/basicprimitives/-/basicprimitives-6.0.3.tgz#8cd72565aa2c4f05acc216a48d0d571bf975b9d4"
+  integrity sha512-q7jiMXQvgUv++t0YDCUEWjIF+rjVaJhfwdlZaXoUMVtb/pfaf0BrbpLgjTsVQPkMNW+p2+y+joHCgBpD6SMEQA==
 
-basicprimitivesreact@^5.9.3:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/basicprimitivesreact/-/basicprimitivesreact-5.9.3.tgz#e892d55dccbb2c59223c665a5cf62f5f7f183308"
-  integrity sha512-Ic8UK9PAwIp9cgmPesgHRjNKJDQ1hZAtfr8iiuTRH4ph+rcPYGpHJKYmIraZ1D+KiBFZU91ynV4LP/l2DWjF+w==
+basicprimitivesreact@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/basicprimitivesreact/-/basicprimitivesreact-6.0.3.tgz#cd21d423e9b93b0427c6094669f22b52ead3c101"
+  integrity sha512-OYFwvzVDQiWQwun7Y7l38sFuGrqlLeVMzt8nt25A7C/Hgg5c29gHHKybQJQhv4EeSeTYsNxv2YLr1onzcx07Bw==
   dependencies:
-    basicprimitives "5.9.2"
+    basicprimitives "6.0.3"
     resize-observer-polyfill "^1.5.1"
 
 batch@0.6.1:
@@ -3130,16 +3136,16 @@ browserslist@4.14.2:
     escalade "^3.0.2"
     node-releases "^1.1.61"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.6.2, browserslist@^4.6.4:
-  version "4.14.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
-  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.15.0, browserslist@^4.6.2, browserslist@^4.6.4:
+  version "4.16.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b"
+  integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==
   dependencies:
-    caniuse-lite "^1.0.30001157"
+    caniuse-lite "^1.0.30001165"
     colorette "^1.2.1"
-    electron-to-chromium "^1.3.591"
+    electron-to-chromium "^1.3.621"
     escalade "^3.1.1"
-    node-releases "^1.1.66"
+    node-releases "^1.1.67"
 
 bser@2.1.1:
   version "2.1.1"
@@ -3301,12 +3307,12 @@ callsites@^3.0.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camel-case@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547"
-  integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
+  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
   dependencies:
-    pascal-case "^3.1.1"
-    tslib "^1.10.0"
+    pascal-case "^3.1.2"
+    tslib "^2.0.3"
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
@@ -3341,10 +3347,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001157:
-  version "1.0.30001159"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20"
-  integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001165:
+  version "1.0.30001166"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001166.tgz#ca73e8747acfd16a4fd6c4b784f1b995f9698cf8"
+  integrity sha512-nCL4LzYK7F4mL0TjEMeYavafOGnBa98vTudH5c8lW9izUjnB99InG6pmC1ElAI1p0GlyZajv4ltUdFXvOHIl1A==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3419,11 +3425,6 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
 check-types@^11.1.1:
   version "11.1.2"
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f"
@@ -3520,18 +3521,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-
 clipboard@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376"
@@ -3559,6 +3548,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -3825,28 +3823,28 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.6.2, core-js-compat@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed"
-  integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==
+core-js-compat@^3.6.2, core-js-compat@^3.8.0:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e"
+  integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==
   dependencies:
-    browserslist "^4.14.6"
+    browserslist "^4.15.0"
     semver "7.0.0"
 
 core-js-pure@^3.0.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz#28a57c861d5698e053f0ff36905f7a3301b4191e"
-  integrity sha512-EZD2ckZysv8MMt4J6HSvS9K2GdtlZtdBncKAmF9lr2n0c9dJUaUN88PSTjvgwCgQPWKTkERXITgS6JJRAnljtg==
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.1.tgz#23f84048f366fdfcf52d3fd1c68fec349177d119"
+  integrity sha512-Se+LaxqXlVXGvmexKGPvnUIYC1jwXu1H6Pkyb3uBM5d8/NELMYCHs/4/roD7721NxrTLyv7e5nXd5/QLBO+10g==
 
 core-js@^2.4.0, core-js@^2.4.1:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.6.5:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f"
-  integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47"
+  integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -4060,10 +4058,10 @@ css-tree@1.0.0-alpha.37:
     mdn-data "2.0.4"
     source-map "^0.6.1"
 
-css-tree@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.1.tgz#30b8c0161d9fb4e9e2141d762589b6ec2faebd2e"
-  integrity sha512-NVN42M2fjszcUNpDbdkvutgQSlFYsr1z7kqeuCagHnNLBfYor6uP1WL1KrkmdYZ5Y1vTBCIOI/C/+8T98fJ71w==
+css-tree@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
+  integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
   dependencies:
     mdn-data "2.0.14"
     source-map "^0.6.1"
@@ -4194,11 +4192,11 @@ cssnano@^4.1.10:
     postcss "^7.0.0"
 
 csso@^4.0.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz#e0cb02d6eb3af1df719222048e4359efd662af13"
-  integrity sha512-Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
+  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
   dependencies:
-    css-tree "^1.0.0"
+    css-tree "^1.1.2"
 
 cssom@^0.4.4:
   version "0.4.4"
@@ -4556,9 +4554,9 @@ domelementtype@1, domelementtype@^1.3.1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
-  integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
+  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
 
 domexception@^2.0.1:
   version "2.0.1"
@@ -4590,13 +4588,13 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-dot-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
-  integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
+dot-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
   dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
+    no-case "^3.0.4"
+    tslib "^2.0.3"
 
 dot-prop@^5.2.0:
   version "5.3.0"
@@ -4615,7 +4613,7 @@ dotenv@8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-duplexer@^0.1.1:
+duplexer@^0.1.1, duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
@@ -4655,10 +4653,10 @@ ejs@^3.1.5:
   dependencies:
     jake "^10.6.1"
 
-electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.591:
-  version "1.3.603"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz#1b71bec27fb940eccd79245f6824c63d5f7e8abf"
-  integrity sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==
+electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.621:
+  version "1.3.627"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.627.tgz#4acdbbbbe31eb605fba8380063fd9c8a7e5ca4a0"
+  integrity sha512-O5IVRS4sCxP2+vECAp7uHkaI8V+dKYpuCyBcLn+hqVAOy/RONd8zx+6eH7TuWSTBYs/oUrzBXkNMZuVsQd58kQ==
 
 elliptic@^6.5.3:
   version "6.5.3"
@@ -4762,7 +4760,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
   version "1.17.7"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
   integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
@@ -5001,9 +4999,9 @@ eslint-visitor-keys@^2.0.0:
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
 eslint-webpack-plugin@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.4.0.tgz#dcfd2653d0e15e52251f34dd3690ce60718d5589"
-  integrity sha512-j0lAJj3RnStAFdIH2P0+nsEImiBijwogZhL1go4bI6DE+9OhQuOmJ/xtmxkLtNr1w0cf5SRNkDlmIe8t/pHgww==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.4.1.tgz#9353ec46a31d29558734a38a05eb14c5760a7144"
+  integrity sha512-cj8iPWZKuAiVD8MMgTSunyMCAvxQxp5mxoPHZl1UMGkApFXaXJHdCFcCR+oZEJbBNhReNa5SjESIn34uqUbBtg==
   dependencies:
     "@types/eslint" "^7.2.4"
     arrify "^2.0.1"
@@ -5012,12 +5010,12 @@ eslint-webpack-plugin@^2.1.0:
     schema-utils "^3.0.0"
 
 eslint@^7.11.0:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344"
-  integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"
+  integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@eslint/eslintrc" "^0.2.1"
+    "@eslint/eslintrc" "^0.2.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -5027,10 +5025,10 @@ eslint@^7.11.0:
     eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^2.0.0"
-    espree "^7.3.0"
+    espree "^7.3.1"
     esquery "^1.2.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    file-entry-cache "^6.0.0"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
     globals "^12.1.0"
@@ -5054,13 +5052,13 @@ eslint@^7.11.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
-  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
     acorn "^7.4.0"
-    acorn-jsx "^5.2.0"
+    acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
@@ -5263,15 +5261,6 @@ extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -5363,19 +5352,12 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+file-entry-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
+  integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
   dependencies:
-    flat-cache "^2.0.1"
+    flat-cache "^3.0.4"
 
 file-loader@6.1.1:
   version "6.1.1"
@@ -5487,19 +5469,18 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+flatted@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
+  integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -5515,9 +5496,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0, follow-redirects@^1.10.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -5695,12 +5676,12 @@ gensync@^1.0.0-beta.1:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.0:
+get-intrinsic@^1.0.0, get-intrinsic@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
   integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
@@ -5859,7 +5840,7 @@ gud@^1.0.0:
   resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
   integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==
 
-gzip-size@5.1.1, gzip-size@^5.1.1:
+gzip-size@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
   integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==
@@ -5867,6 +5848,13 @@ gzip-size@5.1.1, gzip-size@^5.1.1:
     duplexer "^0.1.1"
     pify "^4.0.1"
 
+gzip-size@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
+  dependencies:
+    duplexer "^0.1.2"
+
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
@@ -5998,10 +5986,10 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-highlight.js@^10.1.1, highlight.js@~10.4.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.0.tgz#ef3ce475e5dfa7a48484260b49ea242ddab823a0"
-  integrity sha512-EfrUGcQ63oLJbj0J0RI9ebX6TAITbsDBLbsjr881L/X5fMO9+oadKzEF21C7R3ULKG6Gv3uoab2HiqVJa/4+oA==
+highlight.js@^10.4.1, highlight.js@~10.4.0:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
+  integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -6062,9 +6050,9 @@ html-encoding-sniffer@^2.0.1:
     whatwg-encoding "^1.0.5"
 
 html-entities@^1.2.1, html-entities@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
-  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.3.tgz#3dca638a43ee7de316fc23067398491152ad4736"
+  integrity sha512-/VulV3SYni1taM7a4RMdceqzJWR39gpZHjBwUnsCFKWV/GJkD14CJ5F7eWcZozmHJK0/f/H5U3b3SiPkuvxMgg==
 
 html-escaper@^2.0.0:
   version "2.0.2"
@@ -6207,7 +6195,7 @@ hyphenate-style-name@^1.0.3:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -6362,28 +6350,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-inquirer@7.3.3:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 internal-ip@^4.3.0:
   version "4.3.0"
@@ -6462,9 +6431,11 @@ is-alphanumerical@^1.0.0:
     is-decimal "^1.0.0"
 
 is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
+  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+  dependencies:
+    call-bind "^1.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -6520,9 +6491,9 @@ is-color-stop@^1.0.0:
     rgba-regex "^1.0.0"
 
 is-core-module@^2.0.0, is-core-module@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
-  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
   dependencies:
     has "^1.0.3"
 
@@ -6652,9 +6623,9 @@ is-module@^1.0.0:
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
 is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -7316,9 +7287,9 @@ js-base64@^2.1.8:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -7733,9 +7704,9 @@ lodash.uniq@^4.5.0:
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
 loglevel@^1.6.8:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
-  integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
@@ -7752,14 +7723,14 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lower-case@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
-  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
   dependencies:
-    tslib "^1.10.0"
+    tslib "^2.0.3"
 
-lowlight@^1.14.0:
+lowlight@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.17.0.tgz#a1143b2fba8239df8cd5893f9fe97aaf8465af4a"
   integrity sha512-vmtBgYKD+QVNy7tIa7ulz5d//Il9R4MooOVh4nkOf9R9Cb/Dk5TXMSTieg/vDulkBkIWj59/BIlyFQxT9X1oAQ==
@@ -8004,9 +7975,9 @@ mime@1.6.0:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.4.4:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
-  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
+  integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
@@ -8144,11 +8115,16 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@2.1.2, ms@^2.1.1:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -8162,20 +8138,15 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
 nan@^2.12.1, nan@^2.13.2:
   version "2.14.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
-nanoid@^3.1.18:
-  version "3.1.18"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.18.tgz#0680db22ab01c372e89209f5d18283d98de3e96d"
-  integrity sha512-rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA==
+nanoid@^3.1.20:
+  version "3.1.20"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
+  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -8226,13 +8197,13 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-no-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
-  integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
   dependencies:
-    lower-case "^2.0.1"
-    tslib "^1.10.0"
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
 
 node-forge@^0.10.0:
   version "0.10.0"
@@ -8297,9 +8268,9 @@ node-modules-regexp@^1.0.0:
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
 node-notifier@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
-  integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
+  integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==
   dependencies:
     growly "^1.3.0"
     is-wsl "^2.2.0"
@@ -8308,7 +8279,7 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.61, node-releases@^1.1.66:
+node-releases@^1.1.61, node-releases@^1.1.67:
   version "1.1.67"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
   integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
@@ -8451,17 +8422,17 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
 
 object-is@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
-  integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
+  integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
 
 object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
@@ -8486,31 +8457,33 @@ object.assign@^4.1.0, object.assign@^4.1.1:
     object-keys "^1.1.1"
 
 object.entries@^1.1.0, object.entries@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
-  integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
+  integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
 object.fromentries@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
-  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072"
+  integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
 object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
+  integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -8520,13 +8493,13 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 object.values@^1.1.0, object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
+  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
 obuf@^1.0.0, obuf@^1.1.2:
@@ -8560,7 +8533,7 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^7.0.2, open@^7.1.0:
+open@^7.0.2, open@^7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69"
   integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==
@@ -8624,7 +8597,7 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
@@ -8662,11 +8635,11 @@ p-limit@^2.0.0, p-limit@^2.2.0:
     p-try "^2.0.0"
 
 p-limit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
-  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
-    p-try "^2.0.0"
+    yocto-queue "^0.1.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
@@ -8733,12 +8706,12 @@ parallel-transform@^1.1.0:
     readable-stream "^2.1.5"
 
 param-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238"
-  integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
+  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
   dependencies:
-    dot-case "^3.0.3"
-    tslib "^1.10.0"
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -8805,13 +8778,13 @@ parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-pascal-case@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f"
-  integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==
+pascal-case@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
+  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
   dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
+    no-case "^3.0.4"
+    tslib "^2.0.3"
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -9668,14 +9641,13 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, po
     supports-color "^6.1.0"
 
 postcss@^8.1.0:
-  version "8.1.9"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.9.tgz#20ff4b598a6f5015c5f7fe524b8ed5313d7ecade"
-  integrity sha512-oWuBpEl1meaMKkQXn0ic78TUrgsMvrAZLE/6ZY0H3LTteq2O3L8PGWwMbPLctpksTJIHjQeossMUMNQW7qRIHQ==
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.1.tgz#eabc5557c4558059b9d9e5b15bce7ffa9089c2a8"
+  integrity sha512-RhsqOOAQzTgh1UB/IZdca7F9WDb7SUCR2Vnv1x7DbvuuggQIpoDwjK+q0rzoPffhYvWNKX5JSwS4so4K3UC6vA==
   dependencies:
     colorette "^1.2.1"
-    nanoid "^3.1.18"
+    nanoid "^3.1.20"
     source-map "^0.6.1"
-    vfile-location "^3.2.0"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -9754,7 +9726,7 @@ promise@^8.1.0:
   dependencies:
     asap "~2.0.6"
 
-prompts@^2.0.1:
+prompts@2.4.0, prompts@^2.0.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
   integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
@@ -9946,9 +9918,9 @@ react-codemirror2@^7.2.1:
   integrity sha512-t7YFmz1AXdlImgHXA9Ja0T6AWuopilub24jRaQdPVbzUJVNKIYuy3uCFZYa7CE5S3UW6SrSa5nAqVQvtzRF9gw==
 
 react-dev-utils@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.0.tgz#9fdb1b173f4ffc1f23fcf98465d93b16a860b73e"
-  integrity sha512-uIZTUZXB5tbiM/0auUkLVjWhZGM7DSI304iGunyhA9m985iIDVXd9I4z6MkNa9jeLzeUJbU9A7TUNrcbXAahxw==
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.1.tgz#30106c2055acfd6b047d2dc478a85c356e66fe45"
+  integrity sha512-rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA==
   dependencies:
     "@babel/code-frame" "7.10.4"
     address "1.1.2"
@@ -9964,11 +9936,11 @@ react-dev-utils@^11.0.0:
     globby "11.0.1"
     gzip-size "5.1.1"
     immer "7.0.9"
-    inquirer "7.3.3"
     is-root "2.1.0"
     loader-utils "2.0.0"
     open "^7.0.2"
     pkg-up "3.1.0"
+    prompts "2.4.0"
     react-error-overlay "^6.0.8"
     recursive-readdir "2.2.2"
     shell-quote "1.7.2"
@@ -10033,12 +10005,12 @@ react-helmet@^6.1.0:
     react-fast-compare "^3.1.1"
     react-side-effect "^2.1.0"
 
-react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1:
+react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1:
+"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1:
   version "17.0.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
   integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
@@ -10169,13 +10141,13 @@ react-sortable-hoc@^1.11.0:
     prop-types "^15.5.7"
 
 react-syntax-highlighter@^15.3.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.3.0.tgz#d8bf103123550e0d637fe8cb1feaf68e22bf9944"
-  integrity sha512-ghJkkmNw/3wRf9XEvfGeG7tfTuAMyThdNxJy50s9CmnwS3QusKDC+F5lX6lvX3mm+V0CwN+zpRioQb0kgdT11w==
+  version "15.4.3"
+  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.4.3.tgz#fffe3286677ac470b963b364916d16374996f3a6"
+  integrity sha512-TnhGgZKXr5o8a63uYdRTzeb8ijJOgRGe0qjrE0eK/gajtdyqnSO6LqB3vW16hHB0cFierYSoy/AOJw8z1Dui8g==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    highlight.js "^10.1.1"
-    lowlight "^1.14.0"
+    highlight.js "^10.4.1"
+    lowlight "^1.17.0"
     prismjs "^1.22.0"
     refractor "^3.2.0"
 
@@ -10594,14 +10566,6 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.1
     is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -10647,13 +10611,6 @@ rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@2.6.3, rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -10661,6 +10618,13 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -10709,11 +10673,6 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
 run-parallel@^1.1.9:
   version "1.1.10"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
@@ -10726,13 +10685,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.6.0:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
-  dependencies:
-    tslib "^1.9.0"
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -10878,7 +10830,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.2, semver@^7.2.1, semver@^7.3.2:
+semver@7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
@@ -10888,6 +10840,13 @@ semver@^6.0.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.2.1, semver@^7.3.2:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -11136,9 +11095,9 @@ source-list-map@^2.0.0:
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-map-explorer@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.0.tgz#42e12c76743e8a0ca0579d472ea5ba623e0d0498"
-  integrity sha512-kWhlt0celEwwuULIY+sRoZKibc/8/Ec4ckcKThDMQW3hT7KxReYW1XktwFJIbZ2VF9Yf/hA74bcoIZOSXXQIgQ==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.1.tgz#35ca7ba3574f0002ac347343f1894e04860c827f"
+  integrity sha512-sg60PIva7pOkvTqbLRGOB3Cp84I1pial0J6tUNs/bNGIz+0+WNw37oLXEDFHTDJhFh24rto8rESv4wCB7w9HVQ==
   dependencies:
     btoa "^1.2.1"
     chalk "^4.1.0"
@@ -11146,12 +11105,12 @@ source-map-explorer@^2.5.0:
     ejs "^3.1.5"
     escape-html "^1.0.3"
     glob "^7.1.6"
-    gzip-size "^5.1.1"
+    gzip-size "^6.0.0"
     lodash "^4.17.20"
-    open "^7.1.0"
+    open "^7.3.0"
     source-map "^0.7.3"
-    temp "^0.9.1"
-    yargs "^15.4.1"
+    temp "^0.9.4"
+    yargs "^16.1.1"
 
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
@@ -11239,9 +11198,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
-  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -11694,7 +11653,7 @@ temp-dir@^1.0.0:
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
   integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
 
-temp@^0.9.1:
+temp@^0.9.4:
   version "0.9.4"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620"
   integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==
@@ -11759,9 +11718,9 @@ terser@^4.1.2, terser@^4.6.2, terser@^4.6.3:
     source-map-support "~0.5.12"
 
 terser@^5.3.4:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.0.tgz#1406fcb4d4bc517add3b22a9694284c040e33448"
-  integrity sha512-eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g==
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289"
+  integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==
   dependencies:
     commander "^2.20.0"
     source-map "~0.7.2"
@@ -11794,11 +11753,6 @@ through2@^2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -11826,13 +11780,6 @@ tiny-warning@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -11941,11 +11888,16 @@ tsconfig-paths@^3.9.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
+  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
+
 tsutils@^3.17.1:
   version "3.17.1"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
@@ -12248,9 +12200,9 @@ uuid@^3.3.2, uuid@^3.4.0:
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 uuid@^8.3.0:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
-  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 v8-compile-cache@^2.0.3:
   version "2.2.0"
@@ -12293,11 +12245,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vfile-location@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"
-  integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==
-
 vlq@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468"
@@ -12377,9 +12324,9 @@ webidl-conversions@^6.1.0:
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
 webpack-dev-middleware@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
-  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
+  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
   dependencies:
     memory-fs "^0.4.1"
     mime "^2.4.4"
@@ -12744,6 +12691,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -12759,13 +12715,6 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
@@ -12774,9 +12723,9 @@ ws@^6.2.1:
     async-limiter "~1.0.0"
 
 ws@^7.2.3:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
-  integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb"
+  integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -12794,9 +12743,14 @@ xtend@^4.0.0, xtend@~4.0.1:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+
+y18n@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
+  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
 
 yallist@^2.1.2:
   version "2.1.2"
@@ -12834,6 +12788,11 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^20.2.2:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -12867,6 +12826,24 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.1.1:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 youtube-player@5.5.2:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/youtube-player/-/youtube-player-5.5.2.tgz#052b86b1eabe21ff331095ffffeae285fa7f7cb5"
diff --git a/server/package.json b/server/package.json
index 41c6169..e0c0f6a 100644
--- a/server/package.json
+++ b/server/package.json
@@ -27,7 +27,7 @@
         "@feathersjs/rest-client": "^1.3.2",
         "@feathersjs/socketio": "^3.0.1",
         "@feathersjs/socketio-client": "^1.0.1",
-        "basicprimitives": "^5.9.2",
+        "basicprimitives": "6.0.3",
         "compression": "^1.6.2",
         "cookie-parser": "^1.4.3",
         "cookies-js": "^1.2.3",
diff --git a/server/src/services/demofamilycharts/data/alignmentData.js b/server/src/services/demofamilycharts/data/alignmentData.js
index 79b2518..70c7caf 100644
--- a/server/src/services/demofamilycharts/data/alignmentData.js
+++ b/server/src/services/demofamilycharts/data/alignmentData.js
@@ -1,22 +1,23 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 6,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 2,
       toItem: 5,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/crossShape.js b/server/src/services/demofamilycharts/data/crossShape.js
index e847ee1..9ba0055 100644
--- a/server/src/services/demofamilycharts/data/crossShape.js
+++ b/server/src/services/demofamilycharts/data/crossShape.js
@@ -1,22 +1,23 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 2,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 2,
       toItem: 1,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/famSpouses.js b/server/src/services/demofamilycharts/data/famSpouses.js
index aef6382..f76b245 100644
--- a/server/src/services/demofamilycharts/data/famSpouses.js
+++ b/server/src/services/demofamilycharts/data/famSpouses.js
@@ -1,22 +1,23 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 5,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 5,
       toItem: 8,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/famdata.js b/server/src/services/demofamilycharts/data/famdata.js
index e3f0515..8204d9d 100644
--- a/server/src/services/demofamilycharts/data/famdata.js
+++ b/server/src/services/demofamilycharts/data/famdata.js
@@ -1,40 +1,41 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType, ShapeType, Size } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 5,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 5,
       toItem: 81,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     },
     {
-      annotationType: primitives.common.AnnotationType.Background,
+      annotationType: AnnotationType.Background,
       items: [81, 82, 83, 84, 85],
       borderColor: '#f8e5f9',
       fillColor: '#e5f9f8',
       lineWidth: 2,
       selectItems: true,
-      lineType: primitives.common.LineType.Dotted
+      lineType: LineType.Dotted
     },
     {
-      annotationType: primitives.common.AnnotationType.Shape,
+      annotationType: AnnotationType.Shape,
       items: [5],
       label: { color: "red", badge: "3", title: "Cross Out shape annotation" },
-      labelSize: { width: 120, height: 50 }, // new primitives.common.Size(120, 50)
-      shapeType: primitives.common.ShapeType.CrossOut,
-      borderColor: primitives.common.Colors.Red,
+      labelSize: { width: 120, height: 50 }, // new Size(120, 50)
+      shapeType: ShapeType.CrossOut,
+      borderColor: Colors.Red,
       offset: {
         left: 6,
         top: 3,
@@ -43,15 +44,15 @@ module.exports = {
       },
       lineWidth: 2,
       selectItems: false,
-      lineType: primitives.common.LineType.Dashed
+      lineType: LineType.Dashed
     },
     {
-      annotationType: primitives.common.AnnotationType.Shape,
+      annotationType: AnnotationType.Shape,
       items: [81],
       label: { color: "red", badge: "4", title: "Oval shape annotation" },
-      labelSize: new primitives.common.Size(100, 50), // new primitives.common.Size(100, 50)
-      shapeType: primitives.common.ShapeType.Oval,
-      borderColor: primitives.common.Colors.Red,
+      labelSize: new Size(100, 50), // new Size(100, 50)
+      shapeType: ShapeType.Oval,
+      borderColor: Colors.Red,
       offset: {
         left: 14,
         top: 14,
@@ -60,7 +61,7 @@ module.exports = {
       },
       lineWidth: 2,
       selectItems: true,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       fillColor: null
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/famdata2.js b/server/src/services/demofamilycharts/data/famdata2.js
index 915d364..bdff39b 100644
--- a/server/src/services/demofamilycharts/data/famdata2.js
+++ b/server/src/services/demofamilycharts/data/famdata2.js
@@ -1,22 +1,23 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 5,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 1,
       toItem: 15,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/famdataCascade.js b/server/src/services/demofamilycharts/data/famdataCascade.js
index 4b9dbf4..52b4709 100644
--- a/server/src/services/demofamilycharts/data/famdataCascade.js
+++ b/server/src/services/demofamilycharts/data/famdataCascade.js
@@ -1,22 +1,23 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 10,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 10,
       toItem: 5,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/famdataCharless2.js b/server/src/services/demofamilycharts/data/famdataCharless2.js
index 0e061a4..48addc3 100644
--- a/server/src/services/demofamilycharts/data/famdataCharless2.js
+++ b/server/src/services/demofamilycharts/data/famdataCharless2.js
@@ -1,23 +1,24 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType, PageFitMode } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 2,
-  pageFitMode: primitives.common.PageFitMode.PageWidth,
+  pageFitMode: PageFitMode.PageWidth,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 3,
       toItem: 4,
       label: { color: "red", badge: "1", title: "" },
-      labelSize: { width: 30, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 30, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/famdataLoops.js b/server/src/services/demofamilycharts/data/famdataLoops.js
index bfab189..c7b9b74 100644
--- a/server/src/services/demofamilycharts/data/famdataLoops.js
+++ b/server/src/services/demofamilycharts/data/famdataLoops.js
@@ -1,63 +1,64 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType, PageFitMode } = require('basicprimitives');
 
 module.exports = {
-  pageFitMode: primitives.common.PageFitMode.PageWidth,
+  pageFitMode: PageFitMode.PageWidth,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 1,
       toItem: 5,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       selectItems: true,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     },
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 1,
       toItems: [3],
       title: '10%'
     },
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 1,
       toItems: [5],
       title: '30%'
     },
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 1,
       toItems: [6],
       title: '50%'
     },
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 1,
       toItems: [7],
       title: '10%'
     },
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 1,
       toItems: [3, 5],
       title: '40%'
     },
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 1,
       toItems: [3, 5, 6, 7],
       title: '100%'
     },
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 2,
       toItems: [1],
       title: '100%'
diff --git a/server/src/services/demofamilycharts/data/famdataLoopsTest.js b/server/src/services/demofamilycharts/data/famdataLoopsTest.js
index 8752d34..d151314 100644
--- a/server/src/services/demofamilycharts/data/famdataLoopsTest.js
+++ b/server/src/services/demofamilycharts/data/famdataLoopsTest.js
@@ -1,16 +1,16 @@
-const primitives = require('basicprimitives');
+const { AnnotationType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 2,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 2,
       toItems: [1],
       title: '2->1'
     },
     {
-      annotationType: primitives.common.AnnotationType.Label,
+      annotationType: AnnotationType.Label,
       fromItem: 1,
       toItems: [2],
       title: '1->2'
diff --git a/server/src/services/demofamilycharts/data/famdataOwnership.js b/server/src/services/demofamilycharts/data/famdataOwnership.js
index fa8d43a..939a1df 100644
--- a/server/src/services/demofamilycharts/data/famdataOwnership.js
+++ b/server/src/services/demofamilycharts/data/famdataOwnership.js
@@ -1,22 +1,23 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 5,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 1,
       toItem: 5,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
@@ -26,7 +27,7 @@ module.exports = {
       title: 'Family Ownership',
       label: 'Family Ownership',
       description: '1, Chaiman Name',
-      itemTitleColor: primitives.common.Colors.Black
+      itemTitleColor: Colors.Black
     },
     {
       id: 3,
@@ -34,7 +35,7 @@ module.exports = {
       title: 'Everland',
       label: 'Everland',
       description: '3, Everland',
-      itemTitleColor: primitives.common.Colors.Gray
+      itemTitleColor: Colors.Gray
     },
 
     {
@@ -43,7 +44,7 @@ module.exports = {
       title: 'Life Insurance',
       label: 'Life Insurance',
       description: '10, Life Insurance',
-      itemTitleColor: primitives.common.Colors.Blue
+      itemTitleColor: Colors.Blue
     },
     {
       id: 11,
@@ -51,7 +52,7 @@ module.exports = {
       title: 'Fire & Marine',
       label: 'Fire & Marine',
       description: '11, Fire & Marine',
-      itemTitleColor: primitives.common.Colors.Blue
+      itemTitleColor: Colors.Blue
     },
     {
       id: 12,
@@ -59,7 +60,7 @@ module.exports = {
       title: 'Card',
       label: 'Card',
       description: '12, Card',
-      itemTitleColor: primitives.common.Colors.Blue
+      itemTitleColor: Colors.Blue
     },
     {
       id: 13,
@@ -67,7 +68,7 @@ module.exports = {
       title: 'Securities',
       label: 'Securities',
       description: '13, Securities',
-      itemTitleColor: primitives.common.Colors.Blue
+      itemTitleColor: Colors.Blue
     },
     {
       id: 14,
@@ -75,7 +76,7 @@ module.exports = {
       title: 'Asset Mgmt.',
       label: 'Asset Mgmt.',
       description: '14, Asset Mgmt.',
-      itemTitleColor: primitives.common.Colors.Blue
+      itemTitleColor: Colors.Blue
     },
 
     {
@@ -84,7 +85,7 @@ module.exports = {
       title: 'C&T',
       label: 'C&T',
       description: '20, C&T',
-      itemTitleColor: primitives.common.Colors.DarkRed
+      itemTitleColor: Colors.DarkRed
     },
     {
       id: 21,
@@ -92,7 +93,7 @@ module.exports = {
       title: 'Heavy Industries',
       label: 'Heavy Industries',
       description: '21, Heavy Industries',
-      itemTitleColor: primitives.common.Colors.DarkRed
+      itemTitleColor: Colors.DarkRed
     },
     {
       id: 22,
@@ -100,7 +101,7 @@ module.exports = {
       title: 'Engineering',
       label: 'Engineering',
       description: '22, Engineering',
-      itemTitleColor: primitives.common.Colors.DarkRed
+      itemTitleColor: Colors.DarkRed
     },
     {
       id: 23,
@@ -108,7 +109,7 @@ module.exports = {
       title: 'General Chemicals',
       label: 'General Chemicals',
       description: '23, General Chemicals',
-      itemTitleColor: primitives.common.Colors.DarkRed
+      itemTitleColor: Colors.DarkRed
     },
     {
       id: 24,
@@ -116,7 +117,7 @@ module.exports = {
       title: 'Fine Chemicals',
       label: 'Fine Chemicals',
       description: '24, Fine Chemicals',
-      itemTitleColor: primitives.common.Colors.DarkRed
+      itemTitleColor: Colors.DarkRed
     },
 
     {
@@ -125,7 +126,7 @@ module.exports = {
       title: 'Electronics',
       label: 'Electronics',
       description: '30, Electronics',
-      itemTitleColor: primitives.common.Colors.DarkBlue
+      itemTitleColor: Colors.DarkBlue
     },
     {
       id: 31,
@@ -133,7 +134,7 @@ module.exports = {
       title: 'SEMCO',
       label: 'SEMCO',
       description: '31, SEMCO',
-      itemTitleColor: primitives.common.Colors.DarkBlue
+      itemTitleColor: Colors.DarkBlue
     },
     {
       id: 32,
@@ -141,7 +142,7 @@ module.exports = {
       title: 'SDI',
       label: 'SDI',
       description: '32, SDI',
-      itemTitleColor: primitives.common.Colors.DarkBlue
+      itemTitleColor: Colors.DarkBlue
     },
     {
       id: 33,
@@ -149,7 +150,7 @@ module.exports = {
       title: 'Techwin',
       label: 'Techwin',
       description: '33, Techwin',
-      itemTitleColor: primitives.common.Colors.DarkBlue
+      itemTitleColor: Colors.DarkBlue
     },
     {
       id: 34,
@@ -157,7 +158,7 @@ module.exports = {
       title: 'SDS',
       label: 'SDS',
       description: '34, SDS',
-      itemTitleColor: primitives.common.Colors.DarkBlue
+      itemTitleColor: Colors.DarkBlue
     },
     {
       id: 35,
@@ -165,7 +166,7 @@ module.exports = {
       title: 'Display',
       label: 'Display',
       description: '35, Display',
-      itemTitleColor: primitives.common.Colors.DarkBlue
+      itemTitleColor: Colors.DarkBlue
     },
 
     {
@@ -174,7 +175,7 @@ module.exports = {
       title: 'Welstory',
       label: 'Welstory',
       description: '40, Welstory',
-      itemTitleColor: primitives.common.Colors.Orange
+      itemTitleColor: Colors.Orange
     },
     {
       id: 41,
@@ -182,7 +183,7 @@ module.exports = {
       title: 'A1 Corporation',
       label: 'A1 Corporation',
       description: '41, A1 Corporation',
-      itemTitleColor: primitives.common.Colors.Orange
+      itemTitleColor: Colors.Orange
     },
     {
       id: 42,
@@ -190,7 +191,7 @@ module.exports = {
       title: 'Hotel',
       label: 'Hotel',
       description: '42, Hotel',
-      itemTitleColor: primitives.common.Colors.Orange
+      itemTitleColor: Colors.Orange
     },
     {
       id: 43,
@@ -198,7 +199,7 @@ module.exports = {
       title: 'Worldwide',
       label: 'Worldwide',
       description: '43, Worldwide',
-      itemTitleColor: primitives.common.Colors.Orange
+      itemTitleColor: Colors.Orange
     }
   ]
 };
diff --git a/server/src/services/demofamilycharts/data/famdataWorld.js b/server/src/services/demofamilycharts/data/famdataWorld.js
index 8677440..c0fee3c 100644
--- a/server/src/services/demofamilycharts/data/famdataWorld.js
+++ b/server/src/services/demofamilycharts/data/famdataWorld.js
@@ -1,23 +1,24 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType, PageFitMode } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 2,
-  pageFitMode: primitives.common.PageFitMode.PageWidth,
+  pageFitMode: PageFitMode.PageWidth,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 2,
       toItem: 31,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/familyOrdering.js b/server/src/services/demofamilycharts/data/familyOrdering.js
index 7f5e1b6..cf30070 100644
--- a/server/src/services/demofamilycharts/data/familyOrdering.js
+++ b/server/src/services/demofamilycharts/data/familyOrdering.js
@@ -1,37 +1,39 @@
-const primitives = require('basicprimitives');
+const { PageFitMode, AnnotationType, ConnectorShapeType, ConnectorPlacementType,
+  Colors, ConnectorLabelPlacementType, LineType, ZOrderType, Thickness, AdviserPlacementType
+ } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 1,
-  pageFitMode: primitives.common.PageFitMode.None,
+  pageFitMode: PageFitMode.None,
   selectedItems: [2, 3, 5, 6, 7, 9, 10, 11],
   annotations: [
     {
       name: "usercontrolledconnector",
-      annotationType: primitives.common.AnnotationType.Connector,
+      annotationType: AnnotationType.Connector,
       fromItem: 8,
       toItem: 27,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground
+      lineType: LineType.Dashed,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground
     },
     {
       name: "usercontrolledbackground",
-      annotationType: primitives.common.AnnotationType.Background,
+      annotationType: AnnotationType.Background,
       items: [2, 3, 5, 6, 7, 9, 10, 11],
       borderColor: "#f8e5f9",
       fillColor: "#e5f9f8",
       lineWidth: 2,
       selectItems: true,
       includeChildren: false,
-      lineType: primitives.common.LineType.Dotted,
-      offset: new primitives.common.Thickness(20, 20, 20, 20)
+      lineType: LineType.Dotted,
+      offset: new Thickness(20, 20, 20, 20)
     }
   ],
   items: [
@@ -48,7 +50,7 @@ module.exports = {
       id: 2,
       title: 'Marillier Patricia',
       relativeItem: 1,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#FF0000',
       groupTitle: 'Female',
@@ -78,7 +80,7 @@ module.exports = {
       parents: [3],
       title: 'DUBREUILH Josie',
       relativeItem: 4,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: '2nd child',
       image: '/api/images/photos/d.png',
@@ -89,7 +91,7 @@ module.exports = {
       parents: [3],
       title: 'DUBREUILH Marc',
       relativeItem: 5,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#0000FF',
       groupTitle: 'Male',
@@ -102,7 +104,7 @@ module.exports = {
       id: 7,
       title: 'NIKITENKI Patrick',
       relativeItem: 1,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#0000FF',
       groupTitle: 'Male',
@@ -114,7 +116,7 @@ module.exports = {
       id: 8,
       title: 'PERROT Brigitte',
       relativeItem: 7,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#FF0000',
       groupTitle: 'Female',
@@ -156,7 +158,7 @@ module.exports = {
       id: 12,
       title: 'TAUZIAC Didier',
       relativeItem: 7,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#0000FF',
       groupTitle: 'Male',
@@ -168,7 +170,7 @@ module.exports = {
       id: 13,
       title: 'FAGETE Nadine',
       relativeItem: 12,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#FF0000',
       groupTitle: 'Female',
@@ -190,7 +192,7 @@ module.exports = {
       id: 15,
       title: 'PEYRONNEAU Bernard',
       relativeItem: 12,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#0000FF',
       groupTitle: 'Male',
@@ -202,7 +204,7 @@ module.exports = {
       id: 16,
       title: 'SCHAEFFER Nicole',
       relativeItem: 15,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#FF0000',
       groupTitle: 'Female',
@@ -263,7 +265,7 @@ module.exports = {
       parents: [11],
       title: 'DUBREUILH Pierre',
       relativeItem: 21,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#0000FF',
       groupTitle: 'Male',
@@ -277,7 +279,7 @@ module.exports = {
       parents: [],
       title: 'REBIERE Christiane',
       relativeItem: 22,
-      placementType: primitives.common.AdviserPlacementType.Left,
+      placementType: AdviserPlacementType.Left,
       position: 1,
       description: '23',
       image: '/api/images/photos/r.png',
@@ -297,7 +299,7 @@ module.exports = {
       id: 25,
       title: 'SERTILLANGE Louise',
       relativeItem: 22,
-      placementType: primitives.common.AdviserPlacementType.Left,
+      placementType: AdviserPlacementType.Left,
       position: 2,
       description: '25',
       image: '/api/images/photos/s.png',
@@ -318,7 +320,7 @@ module.exports = {
       parents: [20],
       title: 'TAUZIAC Marie',
       relativeItem: 22,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#FF0000',
       groupTitle: 'Female',
@@ -341,7 +343,7 @@ module.exports = {
       parents: [],
       title: 'BRUGEAUD Michel',
       relativeItem: 27,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: '28',
       image: '/api/images/photos/b.png',
@@ -362,7 +364,7 @@ module.exports = {
       parents: [],
       title: 'FLEURANT Yves',
       relativeItem: 27,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 2,
       description: '31',
       image: '/api/images/photos/f.png',
@@ -391,7 +393,7 @@ module.exports = {
       parents: [24],
       title: 'DUBREUILH Anne',
       relativeItem: 33,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: '2nd child',
       image: '/api/images/photos/d.png',
@@ -403,7 +405,7 @@ module.exports = {
       parents: [],
       title: 'ROUGHEOL Christian',
       relativeItem: 34,
-      placementType: primitives.common.AdviserPlacementType.Left,
+      placementType: AdviserPlacementType.Left,
       position: 1,
       description: '35',
       image: '/api/images/photos/f.png',
@@ -443,7 +445,7 @@ module.exports = {
       id: 39,
       title: 'GIRAUDON Françoise',
       relativeItem: 38,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       groupTitleColor: '#FF0000',
       groupTitle: 'Female',
@@ -494,7 +496,7 @@ module.exports = {
       parents: [42],
       title: 'DUBREUILH Yvette',
       relativeItem: 43,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: 'Deceased 2nd child ',
       image: '/api/images/photos/d.png',
@@ -505,7 +507,7 @@ module.exports = {
       parents: [42],
       title: 'DUBREUILH Yvonne',
       relativeItem: 43,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 2,
       description: '3rd child',
       image: '/api/images/photos/d.png',
@@ -516,7 +518,7 @@ module.exports = {
       parents: [42],
       title: 'DUBREUILH Germaine',
       relativeItem: 43,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 3,
       description: '4th child',
       image: '/api/images/photos/d.png',
@@ -527,7 +529,7 @@ module.exports = {
       id: 47,
       title: 'FLAMAND René',
       relativeItem: 45,
-      placementType: primitives.common.AdviserPlacementType.Left,
+      placementType: AdviserPlacementType.Left,
       position: 1,
       description: '47',
       image: '/api/images/photos/t.png',
@@ -547,7 +549,7 @@ module.exports = {
       id: 49,
       title: 'BORGES José Manuel',
       relativeItem: 45,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: '49',
       image: '/api/images/photos/t.png',
@@ -567,7 +569,7 @@ module.exports = {
       id: 51,
       title: 'SERRE Gilbert',
       relativeItem: 45,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 2,
       description: '47',
       image: '/api/images/photos/t.png',
@@ -587,7 +589,7 @@ module.exports = {
       id: 53,
       title: 'AISA Michel Daniel',
       relativeItem: 46,
-      placementType: primitives.common.AdviserPlacementType.Left,
+      placementType: AdviserPlacementType.Left,
       position: 1,
       description: '53',
       image: '/api/images/photos/t.png',
@@ -616,7 +618,7 @@ module.exports = {
       parents: [48],
       title: 'FLAMAND Jeanine',
       relativeItem: 55,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: '2nd child ',
       image: '/api/images/photos/f.png',
@@ -627,7 +629,7 @@ module.exports = {
       parents: [48],
       title: 'FLAMAND Lucette',
       relativeItem: 55,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 2,
       description: '3rd child',
       image: '/api/images/photos/f.png',
@@ -647,7 +649,7 @@ module.exports = {
       parents: [54],
       title: 'AISA Christine',
       relativeItem: 58,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: '2nd child ',
       image: '/api/images/photos/f.png',
@@ -658,7 +660,7 @@ module.exports = {
       parents: [54],
       title: 'AISA Sandrine',
       relativeItem: 58,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 2,
       description: '3rd child Natural Parent',
       image: '/api/images/photos/f.png',
@@ -696,7 +698,7 @@ module.exports = {
       id: 64,
       title: 'CHARRIERAS Pierre',
       relativeItem: 60,
-      placementType: primitives.common.AdviserPlacementType.Left,
+      placementType: AdviserPlacementType.Left,
       position: 1,
       description: '64, Natural Parent',
       image: '/api/images/photos/f.png',
@@ -716,7 +718,7 @@ module.exports = {
       id: 66,
       title: 'DUWATT Lionel',
       relativeItem: 60,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: 'Adoptive Parent',
       image: '/api/images/photos/f.png',
@@ -726,7 +728,7 @@ module.exports = {
       id: 67,
       title: 'CASTEL Paulette',
       relativeItem: 66,
-      placementType: primitives.common.AdviserPlacementType.Right,
+      placementType: AdviserPlacementType.Right,
       position: 1,
       description: 'Adoptive Parent',
       image: '/api/images/photos/f.png',
diff --git a/server/src/services/demofamilycharts/data/financialOwnership.js b/server/src/services/demofamilycharts/data/financialOwnership.js
index ac107b7..431b93f 100644
--- a/server/src/services/demofamilycharts/data/financialOwnership.js
+++ b/server/src/services/demofamilycharts/data/financialOwnership.js
@@ -1,47 +1,49 @@
-const primitives = require('basicprimitives');
+const { LabelAnnotationConfig, AnnotationType, ConnectorPlacementType, ZOrderType,
+  ConnectorShapeType, HighlightPathAnnotationConfig, ShapeType, ConnectorLabelPlacementType, 
+  Colors, LineType, Enabled } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 3,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 2,
       toItem: 1,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     },
-    new primitives.famdiagram.HighlightPathAnnotationConfig({ items: [3, 5] }),
-    new primitives.famdiagram.HighlightPathAnnotationConfig({ items: [3, 6] }),
+    new HighlightPathAnnotationConfig({ items: [3, 5] }),
+    new HighlightPathAnnotationConfig({ items: [3, 6] }),
 
-    new primitives.famdiagram.LabelAnnotationConfig({
+    new LabelAnnotationConfig({
       fromItem: 4,
       toItems: [5],
       title: '30%',
       templateName: 'LabelAnnotationTemplate'
     }),
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 4, toItems: [5, 7], title: '100%' }),
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 4, toItems: [7], title: '70%' }),
+    new LabelAnnotationConfig({ fromItem: 4, toItems: [5, 7], title: '100%' }),
+    new LabelAnnotationConfig({ fromItem: 4, toItems: [7], title: '70%' }),
 
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 3, toItems: [5], title: '20%' }),
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 3, toItems: [6], title: '80%' }),
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 3, toItems: [5, 6], title: '100%' }),
+    new LabelAnnotationConfig({ fromItem: 3, toItems: [5], title: '20%' }),
+    new LabelAnnotationConfig({ fromItem: 3, toItems: [6], title: '80%' }),
+    new LabelAnnotationConfig({ fromItem: 3, toItems: [5, 6], title: '100%' }),
 
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 6, toItems: [5], title: '⇧27%' }),
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 6, toItems: [3], title: '⇧73%' }),
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 6, toItems: [5, 3], title: '⇧100%' }),
+    new LabelAnnotationConfig({ fromItem: 6, toItems: [5], title: '⇧27%' }),
+    new LabelAnnotationConfig({ fromItem: 6, toItems: [3], title: '⇧73%' }),
+    new LabelAnnotationConfig({ fromItem: 6, toItems: [5, 3], title: '⇧100%' }),
 
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 6, toItems: [7], title: '60%' }),
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 6, toItems: [7, 8], title: '100%' }),
-    new primitives.famdiagram.LabelAnnotationConfig({ fromItem: 6, toItems: [8], title: '40%' })
+    new LabelAnnotationConfig({ fromItem: 6, toItems: [7], title: '60%' }),
+    new LabelAnnotationConfig({ fromItem: 6, toItems: [7, 8], title: '100%' }),
+    new LabelAnnotationConfig({ fromItem: 6, toItems: [8], title: '40%' })
   ],
   items: [
     {
@@ -50,7 +52,7 @@ module.exports = {
       isActive: false,
       templateName: 'ShapeTemplate',
       shapeType: 'rhombus',
-      minimizedItemShapeType: primitives.common.ShapeType.Rhombus
+      minimizedItemShapeType: ShapeType.Rhombus
     },
     {
       id: 2,
@@ -58,34 +60,34 @@ module.exports = {
       isActive: false,
       templateName: 'ShapeTemplate',
       shapeType: 'circle',
-      minimizedItemShapeType: primitives.common.ShapeType.Circle
+      minimizedItemShapeType: ShapeType.Circle
     },
     {
       id: 3,
       parents: [1, 2],
       title: 'Top Holdings',
-      hasSelectorCheckbox: primitives.common.Enabled.True,
-      minimizedItemShapeType: primitives.common.ShapeType.Rectangle
+      hasSelectorCheckbox: Enabled.True,
+      minimizedItemShapeType: ShapeType.Rectangle
     },
     {
       id: 4,
       title: 'Top Holdings Ltd.',
-      hasSelectorCheckbox: primitives.common.Enabled.True,
-      minimizedItemShapeType: primitives.common.ShapeType.Rectangle
+      hasSelectorCheckbox: Enabled.True,
+      minimizedItemShapeType: ShapeType.Rectangle
     },
     {
       id: 5,
       parents: [3, 4],
       title: 'ABC Holdings',
-      hasSelectorCheckbox: primitives.common.Enabled.True,
-      minimizedItemShapeType: primitives.common.ShapeType.Rectangle
+      hasSelectorCheckbox: Enabled.True,
+      minimizedItemShapeType: ShapeType.Rectangle
     },
     {
       id: 6,
       parents: [5, 3],
       title: 'ABC Co Ltd',
-      hasSelectorCheckbox: primitives.common.Enabled.True,
-      minimizedItemShapeType: primitives.common.ShapeType.Rectangle
+      hasSelectorCheckbox: Enabled.True,
+      minimizedItemShapeType: ShapeType.Rectangle
     },
     {
       id: 7,
@@ -94,7 +96,7 @@ module.exports = {
       isActive: false,
       templateName: 'ShapeTemplate',
       shapeType: 'rectangle',
-      minimizedItemShapeType: primitives.common.ShapeType.Rectangle
+      minimizedItemShapeType: ShapeType.Rectangle
     },
     {
       id: 8,
@@ -103,7 +105,7 @@ module.exports = {
       isActive: false,
       templateName: 'ShapeTemplate',
       shapeType: 'rectangle',
-      minimizedItemShapeType: primitives.common.ShapeType.Rectangle
+      minimizedItemShapeType: ShapeType.Rectangle
     }
   ]
 };
diff --git a/server/src/services/demofamilycharts/data/horizontalChain.js b/server/src/services/demofamilycharts/data/horizontalChain.js
index 49374c8..2339165 100644
--- a/server/src/services/demofamilycharts/data/horizontalChain.js
+++ b/server/src/services/demofamilycharts/data/horizontalChain.js
@@ -1,22 +1,23 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 2,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 8,
       toItem: 10,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/matrixLayout.js b/server/src/services/demofamilycharts/data/matrixLayout.js
index faf8bd7..881f17d 100644
--- a/server/src/services/demofamilycharts/data/matrixLayout.js
+++ b/server/src/services/demofamilycharts/data/matrixLayout.js
@@ -1,23 +1,24 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 1,
   enableMatrixLayout: true,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 10,
       toItem: 24,
       label: { color: "red", badge: "1", title: "" },
-      labelSize: { width: 30, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 30, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/mutualFinancialOwnership.js b/server/src/services/demofamilycharts/data/mutualFinancialOwnership.js
index 9a3174f..0104250 100644
--- a/server/src/services/demofamilycharts/data/mutualFinancialOwnership.js
+++ b/server/src/services/demofamilycharts/data/mutualFinancialOwnership.js
@@ -1,34 +1,34 @@
-const primitives = require('basicprimitives');
+const { Colors } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 1,
   items: [
-    { id: 1, title: "Family Ownership", label: "Family Ownership", description: "1, Chaiman Name", itemTitleColor: primitives.common.Colors.Black, labels: { "20": "1.4%", "30": "4.7%", "3": "46.0%", "10": "20.8%", "23": "5.9%", "34": "19.1" } },
-    { id: 2, title: "KCC", label: "KCC", description: "1, KCC", itemTitleColor: primitives.common.Colors.Grey },
-    { id: 3, parents: [1, 2, 12, 20, 31, 32], title: "Samsung Everland", label: "Samsung Everland", description: "3, Samsung Everland", itemTitleColor: primitives.common.Colors.Gray, labels: { "10": "19.3%", "40": "100%" } },
+    { id: 1, title: "Family Ownership", label: "Family Ownership", description: "1, Chaiman Name", itemTitleColor: Colors.Black, labels: { "20": "1.4%", "30": "4.7%", "3": "46.0%", "10": "20.8%", "23": "5.9%", "34": "19.1" } },
+    { id: 2, title: "KCC", label: "KCC", description: "1, KCC", itemTitleColor: Colors.Grey },
+    { id: 3, parents: [1, 2, 12, 20, 31, 32], title: "Samsung Everland", label: "Samsung Everland", description: "3, Samsung Everland", itemTitleColor: Colors.Gray, labels: { "10": "19.3%", "40": "100%" } },
 
-    { id: 10, parents: [1, 3], title: "Samsung Life Insurance", label: "Samsung Life Insurance", description: "10, Samsung Life Insurance", itemTitleColor: primitives.common.Colors.Blue, labels: { "30": "7.2%", "12": "34.4%", "13": "11.1%", "14": "100%", "41": "5.3%", "42": "7.3%", "21": "3.4%" } },
-    { id: 11, parents: [10], title: "Samsung Fire & Marine", label: "Samsung Fire & Marine", description: "11, Samsung Fire & Marine", itemTitleColor: primitives.common.Colors.Blue, labels: { "20": "4.8%", "30": "1.3%", "22": "1.1%", "13": "8.0%", "41": "1.0%" } },
-    { id: 12, parents: [10, 30], title: "Samsung Card", label: "Samsung Card", description: "12, Samsung Card", itemTitleColor: primitives.common.Colors.Blue, labels: { "3": "5%", "41": "1.9%", "42": "1.3%", "43": "3.0%" } },
-    { id: 13, parents: [10, 11], title: "Samsung Securities", label: "Samsung Securities", description: "13, Samsung Securities", itemTitleColor: primitives.common.Colors.Blue, labels: { "33": "2.0%", "41": "1.3%", "42": "3.1%" } },
-    { id: 14, parents: [10], title: "Samsung Asset Mgmt.", label: "Samsung Asset Mgmt.", description: "14, Samsung Asset Mgmt.", itemTitleColor: primitives.common.Colors.Blue },
+    { id: 10, parents: [1, 3], title: "Samsung Life Insurance", label: "Samsung Life Insurance", description: "10, Samsung Life Insurance", itemTitleColor: Colors.Blue, labels: { "30": "7.2%", "12": "34.4%", "13": "11.1%", "14": "100%", "41": "5.3%", "42": "7.3%", "21": "3.4%" } },
+    { id: 11, parents: [10], title: "Samsung Fire & Marine", label: "Samsung Fire & Marine", description: "11, Samsung Fire & Marine", itemTitleColor: Colors.Blue, labels: { "20": "4.8%", "30": "1.3%", "22": "1.1%", "13": "8.0%", "41": "1.0%" } },
+    { id: 12, parents: [10, 30], title: "Samsung Card", label: "Samsung Card", description: "12, Samsung Card", itemTitleColor: Colors.Blue, labels: { "3": "5%", "41": "1.9%", "42": "1.3%", "43": "3.0%" } },
+    { id: 13, parents: [10, 11], title: "Samsung Securities", label: "Samsung Securities", description: "13, Samsung Securities", itemTitleColor: Colors.Blue, labels: { "33": "2.0%", "41": "1.3%", "42": "3.1%" } },
+    { id: 14, parents: [10], title: "Samsung Asset Mgmt.", label: "Samsung Asset Mgmt.", description: "14, Samsung Asset Mgmt.", itemTitleColor: Colors.Blue },
 
-    { id: 20, parents: [1, 32, 11], title: "Samsung C&T", label: "Samsung C&T", description: "20, Samsung C&T", itemTitleColor: primitives.common.Colors.DarkRed, labels: { "3": "1.5%", "30": "4.1%", "22": "7.8%", "23": "37.0%", "24": "5.6%", "34": "17.1", "43": "12.6%" } },
-    { id: 21, parents: [31, 30, 10], title: "Samsung Heavy Industries", label: "Samsung Heavy Industries", description: "21, Samsung Heavy Industries", itemTitleColor: primitives.common.Colors.DarkRed },
-    { id: 22, parents: [20, 11, 32], title: "Samsung Engineering", label: "Samsung Engineering", description: "22, Samsung Engineering", itemTitleColor: primitives.common.Colors.DarkRed },
-    { id: 23, parents: [1, 20, 24, 31, 33, 30, 32], title: "Samsung General Chemicals", label: "Samsung General Chemicals", description: "23, Samsung General Chemicals", itemTitleColor: primitives.common.Colors.DarkRed },
-    { id: 24, parents: [20, 42, 32, 30], title: "Samsung Fine Chemicals", label: "Samsung Fine Chemicals", description: "24, Samsung Fine Chemicals", itemTitleColor: primitives.common.Colors.DarkRed, labels: { "23": "3.1%" } },
+    { id: 20, parents: [1, 32, 11], title: "Samsung C&T", label: "Samsung C&T", description: "20, Samsung C&T", itemTitleColor: Colors.DarkRed, labels: { "3": "1.5%", "30": "4.1%", "22": "7.8%", "23": "37.0%", "24": "5.6%", "34": "17.1", "43": "12.6%" } },
+    { id: 21, parents: [31, 30, 10], title: "Samsung Heavy Industries", label: "Samsung Heavy Industries", description: "21, Samsung Heavy Industries", itemTitleColor: Colors.DarkRed },
+    { id: 22, parents: [20, 11, 32], title: "Samsung Engineering", label: "Samsung Engineering", description: "22, Samsung Engineering", itemTitleColor: Colors.DarkRed },
+    { id: 23, parents: [1, 20, 24, 31, 33, 30, 32], title: "Samsung General Chemicals", label: "Samsung General Chemicals", description: "23, Samsung General Chemicals", itemTitleColor: Colors.DarkRed },
+    { id: 24, parents: [20, 42, 32, 30], title: "Samsung Fine Chemicals", label: "Samsung Fine Chemicals", description: "24, Samsung Fine Chemicals", itemTitleColor: Colors.DarkRed, labels: { "23": "3.1%" } },
 
-    { id: 30, parents: [1, 20, 10, 11], title: "Samsung Electronics", label: "Samsung Electronics", description: "30, Samsung Electronics", itemTitleColor: primitives.common.Colors.DarkBlue, labels: { "12": "37.5%", "31": "23.7%", "32": "19.6%", "21": "17.6%", "33": "25.5%", "23": "5.3%", "24": "8.4%", "34": "22.6", "35": "84.8%", "42": "5.1%", "43": "2.6%" } },
-    { id: 31, parents: [30], title: "SEMCO", label: "SEMCO", description: "31, SEMCO", itemTitleColor: primitives.common.Colors.DarkBlue, labels: { "21": "0%", "3": "4.0%", "23": "9.0%", "34": "7.9%" } },
-    { id: 32, parents: [30], title: "Samsung SDI", label: "Samsung SDI", description: "32, Samsung SDI", itemTitleColor: primitives.common.Colors.DarkBlue, labels: { "20": "7.2%", "3": "8.0%", "41": "11.0%", "22": "13.1%", "23": "13.1%", "24": "14.7%", "35": "15.2%" } },
-    { id: 33, parents: [30, 13], title: "Samsung Techwin", label: "Samsung Techwin", description: "33, Samsung Techwin", itemTitleColor: primitives.common.Colors.DarkBlue, labels: { "23": "22.6%" } },
-    { id: 34, parents: [1, 20, 30, 31], title: "Samsung SDS", label: "Samsung SDS", description: "34, Samsung SDS", itemTitleColor: primitives.common.Colors.DarkBlue },
-    { id: 35, parents: [30, 32], title: "Samsung Display", label: "Samsung Display", description: "35, Samsung Display", itemTitleColor: primitives.common.Colors.DarkBlue },
+    { id: 30, parents: [1, 20, 10, 11], title: "Samsung Electronics", label: "Samsung Electronics", description: "30, Samsung Electronics", itemTitleColor: Colors.DarkBlue, labels: { "12": "37.5%", "31": "23.7%", "32": "19.6%", "21": "17.6%", "33": "25.5%", "23": "5.3%", "24": "8.4%", "34": "22.6", "35": "84.8%", "42": "5.1%", "43": "2.6%" } },
+    { id: 31, parents: [30], title: "SEMCO", label: "SEMCO", description: "31, SEMCO", itemTitleColor: Colors.DarkBlue, labels: { "21": "0%", "3": "4.0%", "23": "9.0%", "34": "7.9%" } },
+    { id: 32, parents: [30], title: "Samsung SDI", label: "Samsung SDI", description: "32, Samsung SDI", itemTitleColor: Colors.DarkBlue, labels: { "20": "7.2%", "3": "8.0%", "41": "11.0%", "22": "13.1%", "23": "13.1%", "24": "14.7%", "35": "15.2%" } },
+    { id: 33, parents: [30, 13], title: "Samsung Techwin", label: "Samsung Techwin", description: "33, Samsung Techwin", itemTitleColor: Colors.DarkBlue, labels: { "23": "22.6%" } },
+    { id: 34, parents: [1, 20, 30, 31], title: "Samsung SDS", label: "Samsung SDS", description: "34, Samsung SDS", itemTitleColor: Colors.DarkBlue },
+    { id: 35, parents: [30, 32], title: "Samsung Display", label: "Samsung Display", description: "35, Samsung Display", itemTitleColor: Colors.DarkBlue },
 
-    { id: 40, parents: [3], title: "Samsung Welstory", label: "Samsung Welstory", description: "40, Samsung Welstory", itemTitleColor: primitives.common.Colors.Orange },
-    { id: 41, parents: [10, 11, 12, 32, 13], title: "S1 Corporation", label: "S1 Corporation", description: "41, S1 Corporation", itemTitleColor: primitives.common.Colors.Orange },
-    { id: 42, parents: [10, 12, 13, 30], title: "Hotel Shilla", label: "Hotel Shilla", description: "42, Hotel Shilla", itemTitleColor: primitives.common.Colors.Orange, labels: { "24": "2.2%" } },
-    { id: 43, parents: [30, 12, 20], title: "Chell Worldwide", label: "Chell Worldwide", description: "43, Chell Worldwide", itemTitleColor: primitives.common.Colors.Orange }
+    { id: 40, parents: [3], title: "Samsung Welstory", label: "Samsung Welstory", description: "40, Samsung Welstory", itemTitleColor: Colors.Orange },
+    { id: 41, parents: [10, 11, 12, 32, 13], title: "S1 Corporation", label: "S1 Corporation", description: "41, S1 Corporation", itemTitleColor: Colors.Orange },
+    { id: 42, parents: [10, 12, 13, 30], title: "Hotel Shilla", label: "Hotel Shilla", description: "42, Hotel Shilla", itemTitleColor: Colors.Orange, labels: { "24": "2.2%" } },
+    { id: 43, parents: [30, 12, 20], title: "Chell Worldwide", label: "Chell Worldwide", description: "43, Chell Worldwide", itemTitleColor: Colors.Orange }
   ]
 };
diff --git a/server/src/services/demofamilycharts/data/rombusShape.js b/server/src/services/demofamilycharts/data/rombusShape.js
index f122dee..59d1bb3 100644
--- a/server/src/services/demofamilycharts/data/rombusShape.js
+++ b/server/src/services/demofamilycharts/data/rombusShape.js
@@ -1,23 +1,24 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType, PageFitMode } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 1,
-  pageFitMode: primitives.common.PageFitMode.PageWidth,
+  pageFitMode: PageFitMode.PageWidth,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 3,
       toItem: 8,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/sandClockShape.js b/server/src/services/demofamilycharts/data/sandClockShape.js
index e55eecd..1d247cc 100644
--- a/server/src/services/demofamilycharts/data/sandClockShape.js
+++ b/server/src/services/demofamilycharts/data/sandClockShape.js
@@ -1,23 +1,24 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType, PageFitMode } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 7,
-  pageFitMode: primitives.common.PageFitMode.PageWidth,
+  pageFitMode: PageFitMode.PageWidth,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 7,
       toItem: 10,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/sideBySide.js b/server/src/services/demofamilycharts/data/sideBySide.js
index c04189c..6035ace 100644
--- a/server/src/services/demofamilycharts/data/sideBySide.js
+++ b/server/src/services/demofamilycharts/data/sideBySide.js
@@ -1,23 +1,24 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType, PageFitMode } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 5,
-  pageFitMode: primitives.common.PageFitMode.PageWidth,
+  pageFitMode: PageFitMode.PageWidth,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 36,
       toItem: 16,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/skippedMembers.js b/server/src/services/demofamilycharts/data/skippedMembers.js
index 6504090..9e47581 100644
--- a/server/src/services/demofamilycharts/data/skippedMembers.js
+++ b/server/src/services/demofamilycharts/data/skippedMembers.js
@@ -1,22 +1,23 @@
-const primitives = require('basicprimitives');
+const { AnnotationType, ConnectorPlacementType, ConnectorLabelPlacementType, ZOrderType,
+  ConnectorShapeType, Colors, LineType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 12,
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 2,
       toItem: 13,
       label: { color: "red", badge: "1", title: "Connector annotation" },
-      labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      color: primitives.common.Colors.Red,
+      labelSize: { width: 80, height: 30 }, // new Size(80, 30)
+      connectorShapeType: ConnectorShapeType.OneWay,
+      color: Colors.Red,
       offset: 5,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       name: "usercontrolledconnector"
     }
   ],
diff --git a/server/src/services/demofamilycharts/data/techTree.js b/server/src/services/demofamilycharts/data/techTree.js
index 4c32054..f9259ad 100644
--- a/server/src/services/demofamilycharts/data/techTree.js
+++ b/server/src/services/demofamilycharts/data/techTree.js
@@ -1,16 +1,16 @@
-const primitives = require('basicprimitives');
+const { PageFitMode, AdviserPlacementType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 1,
-  pageFitMode: primitives.common.PageFitMode.None,
+  pageFitMode: PageFitMode.None,
   items: [
     { id: 1, parents: [], title: "Start", itemTitleColor: "green" },
 
     { id: 2, parents: [1], title: "Basic Rocketry", itemTitleColor: "green" },
-    { id: 3, parents: [1], title: "Engineering 101", itemTitleColor: "green", relativeItem: 2, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
-    { id: 4, parents: [1], title: "Subsonic Flight", itemTitleColor: "blue", relativeItem: 3, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
-    { id: 5, parents: [1], title: "Airships", itemTitleColor: "blue", relativeItem: 4, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
-    { id: 6, parents: [1], title: "Physics and Chemistry", itemTitleColor: "green", relativeItem: 5, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 3, parents: [1], title: "Engineering 101", itemTitleColor: "green", relativeItem: 2, placementType: AdviserPlacementType.Right, position: 1 },
+    { id: 4, parents: [1], title: "Subsonic Flight", itemTitleColor: "blue", relativeItem: 3, placementType: AdviserPlacementType.Right, position: 1 },
+    { id: 5, parents: [1], title: "Airships", itemTitleColor: "blue", relativeItem: 4, placementType: AdviserPlacementType.Right, position: 1 },
+    { id: 6, parents: [1], title: "Physics and Chemistry", itemTitleColor: "green", relativeItem: 5, placementType: AdviserPlacementType.Right, position: 1 },
 
     { id: 7, parents: [2], title: "General Rocketry", itemTitleColor: "green", primaryParent: 2 },
     { id: 8, parents: [2, 3], title: "Launch Stands", itemTitleColor: "green" },
@@ -18,12 +18,12 @@ module.exports = {
     { id: 10, parents: [3, 4, 6], title: "Stability", itemTitleColor: "green", primaryParent: 4 },
     { id: 11, parents: [5], title: "Improved Airships", itemTitleColor: "blue" },
     { id: 12, parents: [6], title: "Survivability", itemTitleColor: "green" },
-    { id: 13, parents: [6], title: "Advanced Physics and Chemistry", itemTitleColor: "green", relativeItem: 12, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 13, parents: [6], title: "Advanced Physics and Chemistry", itemTitleColor: "green", relativeItem: 12, placementType: AdviserPlacementType.Right, position: 1 },
 
     { id: 14, parents: [7], title: "Advanced Rocketry", itemTitleColor: "green", primaryParent: 7 },
     { id: 15, parents: [7, 8], title: "Standardized Construction", itemTitleColor: "green" },
     { id: 16, parents: [8], title: "General Launch Bases", itemTitleColor: "green" },
-    { id: 17, parents: [8], title: "Specialized Launch Bases", itemTitleColor: "green", relativeItem: 16, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 17, parents: [8], title: "Specialized Launch Bases", itemTitleColor: "green", relativeItem: 16, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 18, parents: [9], title: "Submarine Engineering", itemTitleColor: "green" },
     { id: 19, parents: [10], title: "Aviation", itemTitleColor: "green", primaryParent: 10 },
     { id: 20, parents: [11], title: "Advanced Airships", itemTitleColor: "blue" },
@@ -32,30 +32,30 @@ module.exports = {
     { id: 23, parents: [13], title: "Elemental Physics and Chemistry", itemTitleColor: "green" },
 
     { id: 24, parents: [14], title: "Heavy Rocketry", itemTitleColor: "green", primaryParent: 14 },
-    { id: 25, parents: [14], title: "Propulsion Systems", itemTitleColor: "green", relativeItem: 24, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 25, parents: [14], title: "Propulsion Systems", itemTitleColor: "green", relativeItem: 24, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 26, parents: [14, 15], title: "Fuel Systems", itemTitleColor: "green" },
     { id: 27, parents: [15], title: "Advanced Construction", itemTitleColor: "green" },
     { id: 28, parents: [16], title: "Heavy Mobile Launches", itemTitleColor: "green" },
     { id: 29, parents: [18], title: "Advanced Naval Engineering", itemTitleColor: "green" },
     { id: 30, parents: [15, 19], title: "Aerodynamics", itemTitleColor: "green", primaryParent: 19 },
-    { id: 31, parents: [19], title: "Retractable Landing Gear", itemTitleColor: "blue", relativeItem: 30, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 31, parents: [19], title: "Retractable Landing Gear", itemTitleColor: "blue", relativeItem: 30, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 32, parents: [19, 21], title: "VTOL Flight", itemTitleColor: "green" },
     { id: 33, parents: [21], title: "Advanced Flight Control", itemTitleColor: "green" },
     { id: 34, parents: [22], title: "Command Pods", itemTitleColor: "magenta" },
     { id: 35, parents: [21, 23], title: "Space Exploration", itemTitleColor: "green", primaryParent: 23 },
     { id: 36, parents: [23], title: "Minituarization", itemTitleColor: "green" },
-    { id: 37, parents: [23], title: "Solid-State Electronics", itemTitleColor: "green", relativeItem: 36, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
-    { id: 38, parents: [23], title: "Storage technology", itemTitleColor: "gray", relativeItem: 37, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 37, parents: [23], title: "Solid-State Electronics", itemTitleColor: "green", relativeItem: 36, placementType: AdviserPlacementType.Right, position: 1 },
+    { id: 38, parents: [23], title: "Storage technology", itemTitleColor: "gray", relativeItem: 37, placementType: AdviserPlacementType.Right, position: 1 },
 
     { id: 39, parents: [24], title: "Nuclear Power", itemTitleColor: "brown" },
-    { id: 40, parents: [24], title: "Heavier Rocketry", itemTitleColor: "green", primaryParent: 24, relativeItem: 39, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 40, parents: [24], title: "Heavier Rocketry", itemTitleColor: "green", primaryParent: 24, relativeItem: 39, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 41, parents: [25], title: "Precision Propulsion", itemTitleColor: "green" },
     { id: 42, parents: [25, 26], title: "Advanced Fuel Systems", itemTitleColor: "green" },
     { id: 43, parents: [27], title: "Specialized Construction", itemTitleColor: "green" },
     { id: 44, parents: [28], title: "Specialized Mobile Launches", itemTitleColor: "green" },
-    { id: 45, parents: [27], title: "Actuators", itemTitleColor: "green", relativeItem: 43, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 45, parents: [27], title: "Actuators", itemTitleColor: "green", relativeItem: 43, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 46, parents: [30], title: "Supersonic Flight", itemTitleColor: "green" },
-    { id: 47, parents: [30], title: "Advanced Aerodynamics", itemTitleColor: "green", primaryParent: 30, relativeItem: 46, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 47, parents: [30], title: "Advanced Aerodynamics", itemTitleColor: "green", primaryParent: 30, relativeItem: 46, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 48, parents: [30, 31], title: "Electric Engines", itemTitleColor: "blue", primaryParent: 31 },
     { id: 49, parents: [30, 32], title: "Advanced VTOL Flight", itemTitleColor: "green", primaryParent: 32 },
     { id: 50, parents: [33], title: "Specialized Control", itemTitleColor: "green" },
@@ -63,7 +63,7 @@ module.exports = {
     { id: 52, parents: [35], title: "Space Science", itemTitleColor: "green" },
     { id: 53, parents: [36, 37], title: "Large Scale Integration", itemTitleColor: "green" },
     { id: 54, parents: [37], title: "High-Power Electronics", itemTitleColor: "green" },
-    { id: 55, parents: [37], title: "Heat Management Systems", itemTitleColor: "orange", relativeItem: 54, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 55, parents: [37], title: "Heat Management Systems", itemTitleColor: "orange", relativeItem: 54, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 56, parents: [38], title: "Early Modular Habitation", itemTitleColor: "green" },
 
 
@@ -71,7 +71,7 @@ module.exports = {
     { id: 58, parents: [41], title: "Advanced Propulsion", itemTitleColor: "green", primaryParent: 41 },
     { id: 59, parents: [42, 43], title: "Large Volume Containment", itemTitleColor: "green" },
     { id: 60, parents: [43], title: "Advanced Metal Works", itemTitleColor: "green" },
-    { id: 61, parents: [43], title: "Composites", itemTitleColor: "green", relativeItem: 60, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 61, parents: [43], title: "Composites", itemTitleColor: "green", relativeItem: 60, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 62, parents: [45], title: "Advanced Actuators", itemTitleColor: "gray" },
     { id: 63, parents: [46], title: "High Altitude Flight", itemTitleColor: "green" },
     { id: 64, parents: [44, 47], title: "Heavy Aerodynamics", itemTitleColor: "green", primaryParent: 47 },
@@ -86,7 +86,7 @@ module.exports = {
     { id: 73, parents: [166], title: "Logistics", itemTitleColor: "gray" },
 
     { id: 74, parents: [171], title: "Improved Nuclear Power", itemTitleColor: "brown" },
-    { id: 75, parents: [171], title: "Nuclear Fuel Systems", itemTitleColor: "brown", relativeItem: 74, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 75, parents: [171], title: "Nuclear Fuel Systems", itemTitleColor: "brown", relativeItem: 74, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 76, parents: [57], title: "Imporved Nuclear Propulsion", itemTitleColor: "brown" },
     { id: 77, parents: [40, 59], title: "Very Heavy Rocketry", itemTitleColor: "green", primaryParent: 40 },
     { id: 78, parents: [59], title: "High Performance Fuel Systems", itemTitleColor: "green" },
@@ -127,7 +127,7 @@ module.exports = {
     { id: 112, parents: [91], title: "Emergent Systems", itemTitleColor: "magenta" },
     { id: 113, parents: [92], title: "Experimental Electronics", itemTitleColor: "green" },
     { id: 114, parents: [93], title: "Advanced Photovoltaic Materials", itemTitleColor: "navy" },
-    { id: 115, parents: [93], title: "Cutting-Edge Solar Technology", itemTitleColor: "navy", relativeItem: 114, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 115, parents: [93], title: "Cutting-Edge Solar Technology", itemTitleColor: "navy", relativeItem: 114, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 116, parents: [95], title: "Life Sciences", itemTitleColor: "green" },
     { id: 117, parents: [167], title: "Advanced Logistics", itemTitleColor: "gray" },
 
@@ -146,7 +146,7 @@ module.exports = {
     { id: 129, parents: [108], title: "Advanced Off-World Mining", itemTitleColor: "green" },
     { id: 130, parents: [109], title: "Scientific Outposts", itemTitleColor: "LightSeaGreen" },
     { id: 131, parents: [110], title: "Plasma Propulsion", itemTitleColor: "#533153" },
-    { id: 132, parents: [110], title: "Advanced Electrostatic Thrusters", itemTitleColor: "#533153", relativeItem: 131, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 132, parents: [110], title: "Advanced Electrostatic Thrusters", itemTitleColor: "#533153", relativeItem: 131, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 133, parents: [111, 112], title: "Speculative Execution", itemTitleColor: "magenta" },
     { id: 134, parents: [113], title: "High-Tech Electrical Systems", itemTitleColor: "navy" },
     { id: 135, parents: [113, 114], title: "Microwave Power Transmission", itemTitleColor: "navy" },
@@ -186,7 +186,7 @@ module.exports = {
 
     { id: 165, parents: [161, 162], title: "Unified Field Theory", itemTitleColor: "brown" },
 
-    { id: 166, parents: [38], templateName: "dot", itemTitleColor: "gray", relativeItem: 56, placementType: primitives.common.AdviserPlacementType.Right, position: 1 },
+    { id: 166, parents: [38], templateName: "dot", itemTitleColor: "gray", relativeItem: 56, placementType: AdviserPlacementType.Right, position: 1 },
     { id: 167, parents: [73], templateName: "dot", itemTitleColor: "gray" },
     { id: 168, parents: [55], templateName: "dot", itemTitleColor: "orange" },
     { id: 169, parents: [94], templateName: "dot", itemTitleColor: "orange" },
diff --git a/server/src/services/demoorganizationalcharts/data/largeorganizationalchart.js b/server/src/services/demoorganizationalcharts/data/largeorganizationalchart.js
index 0360b2b..545cc41 100644
--- a/server/src/services/demoorganizationalcharts/data/largeorganizationalchart.js
+++ b/server/src/services/demoorganizationalcharts/data/largeorganizationalchart.js
@@ -1,9 +1,9 @@
-const primitives = require('basicprimitives');
+const { Tree } = require('basicprimitives');
 
 // selecting all data from data source and filtering it in business layer is not optimal,
 // you have to design your data base properly so you don't need to fetch all nodes to filter them
 function filterData(items = [], cursorItem = null, selectedItems = [], depth = 3) {
-  const tree = primitives.common.tree();
+  const tree = Tree();
 
   // rebuild tree
   for (let index = 0; index < items.length; index += 1) {
diff --git a/server/src/services/demoorganizationalcharts/data/matrixlayout.js b/server/src/services/demoorganizationalcharts/data/matrixlayout.js
index 494fc22..ecdb1d7 100644
--- a/server/src/services/demoorganizationalcharts/data/matrixlayout.js
+++ b/server/src/services/demoorganizationalcharts/data/matrixlayout.js
@@ -1,4 +1,4 @@
-const primitives = require('basicprimitives');
+const { Enabled, AdviserPlacementType, PlacementType, ItemType, ChildrenPlacementType, TextOrientationType } = require('basicprimitives');
 
 module.exports = {
   cursorItem: 1,
@@ -16,20 +16,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: null,
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       phone: '(425) 374-66-76',
       email: 'jeanna@name.com'
     },
@@ -46,20 +46,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Adviser,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Adviser,
+      adviserPlacementType: AdviserPlacementType.Right,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: null,
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       phone: '(496) 115-11-81',
       email: 'james@name.com'
     },
@@ -76,20 +76,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Assistant,
+      adviserPlacementType: AdviserPlacementType.Right,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: null,
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       phone: '(466) 585-20-76',
       email: 'assistant@name.com'
     },
@@ -106,20 +106,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Right,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: null,
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       phone: '(459) 245-95-47',
       email: 'regu@name.com'
     },
@@ -136,20 +136,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Adviser,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Left,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Adviser,
+      adviserPlacementType: AdviserPlacementType.Left,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: null,
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       phone: '(427) 250-84-97',
       email: 'advis@name.com'
     },
@@ -166,20 +166,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Assistant,
+      adviserPlacementType: AdviserPlacementType.Right,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: null,
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       phone: '(493) 199-26-58',
       email: 'assistant1@name.com'
     },
@@ -196,20 +196,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Assistant,
+      adviserPlacementType: AdviserPlacementType.Right,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: null,
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       phone: '(498) 108-61-94',
       email: 'assistant@name.com'
     },
@@ -226,20 +226,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: null,
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       phone: '(472) 274-85-64',
       email: 'regu@name.com'
     },
@@ -256,20 +256,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Matrix,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: 'E',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: 'manager@name.com',
       phone: '(497) 237-85-88'
     },
@@ -286,20 +286,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '0',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '0memberof@name.com',
       phone: '(403) 735-44-46'
     },
@@ -316,20 +316,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '1',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '1member @name.com',
       phone: '(422) 152-72-70'
     },
@@ -346,20 +346,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '2',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '2membe@name.com',
       phone: '(404) 497-89-66'
     },
@@ -376,20 +376,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '3',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '3memberofl@name.com',
       phone: '(430) 429-95-50'
     },
@@ -406,20 +406,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '4',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '4memberof@name.com',
       phone: '(424) 478-38-68'
     },
@@ -436,20 +436,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '5',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '5memberof@name.com',
       phone: '(488) 304-23-99'
     },
@@ -466,20 +466,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '6',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '6memberof@name.com',
       phone: '(435) 257-89-44'
     },
@@ -496,20 +496,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '7',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '7memberof@name.com',
       phone: '(500) 270-76-20'
     },
@@ -526,20 +526,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '8',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '8memberof@name.com',
       phone: '(400) 528-47-20'
     },
@@ -556,20 +556,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '9',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '9member of e@name.com',
       phone: '(498) 197-83-21'
     },
@@ -586,20 +586,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '10',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '10memberof@name.com',
       phone: '(409) 452-12-46'
     },
@@ -616,20 +616,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '11',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '11memberof@name.com',
       phone: '(414) 580-17-93'
     },
@@ -646,20 +646,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '12',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '12member@name.com',
       phone: '(498) 363-29-99'
     },
@@ -676,20 +676,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '13',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '13memberof@name.com',
       phone: '(426) 345-39-62'
     },
@@ -706,20 +706,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '14',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '14memb@name.com',
       phone: '(469) 253-58-16'
     },
@@ -736,20 +736,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '15',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '15member @name.com',
       phone: '(498) 632-64-51'
     },
@@ -766,20 +766,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '16',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '16memb@name.com',
       phone: '(420) 142-43-20'
     },
@@ -796,20 +796,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '17',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '17member @name.com',
       phone: '(432) 315-63-85'
     },
@@ -826,20 +826,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '18',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '18membe@name.com',
       phone: '(448) 612-49-57'
     },
@@ -856,20 +856,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '19',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '19member of e@name.com',
       phone: '(451) 491-75-58'
     },
@@ -886,20 +886,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '20',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '20member @name.com',
       phone: '(436) 480-10-40'
     },
@@ -916,20 +916,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '21',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '21memberof@name.com',
       phone: '(485) 265-88-25'
     },
@@ -946,20 +946,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '22',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '22member of e@name.com',
       phone: '(473) 422-64-84'
     },
@@ -976,20 +976,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '23',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '23memberof@name.com',
       phone: '(470) 759-92-96'
     },
@@ -1006,20 +1006,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '24',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '24member of e@name.com',
       phone: '(455) 169-88-62'
     },
@@ -1036,20 +1036,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Matrix,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: 'V',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: 'managerv@name.com',
       phone: '(440) 568-64-62'
     },
@@ -1066,20 +1066,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '0',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '0memberofl@name.com',
       phone: '(401) 451-63-92'
     },
@@ -1096,20 +1096,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '1',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '1member @name.com',
       phone: '(471) 726-47-73'
     },
@@ -1126,20 +1126,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '2',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '2memberofl@name.com',
       phone: '(453) 567-48-86'
     },
@@ -1156,20 +1156,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '3',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '3memberof@name.com',
       phone: '(400) 141-91-54'
     },
@@ -1186,20 +1186,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '4',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '4memberof@name.com',
       phone: '(430) 407-53-46'
     },
@@ -1216,20 +1216,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '5',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '5memberof@name.com',
       phone: '(457) 763-92-52'
     },
@@ -1246,20 +1246,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '6',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '6memberof@name.com',
       phone: '(402) 640-87-27'
     },
@@ -1276,20 +1276,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '7',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '7member of v@name.com',
       phone: '(400) 441-68-74'
     },
@@ -1306,20 +1306,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '8',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '8memberof@name.com',
       phone: '(479) 150-80-58'
     },
@@ -1336,20 +1336,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '9',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '9memberof@name.com',
       phone: '(500) 471-14-28'
     },
@@ -1366,20 +1366,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '10',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '10memberofl@name.com',
       phone: '(433) 741-58-23'
     },
@@ -1396,20 +1396,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '11',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '11member of v@name.com',
       phone: '(467) 567-90-99'
     },
@@ -1426,20 +1426,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '12',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '12memb@name.com',
       phone: '(400) 556-33-23'
     },
@@ -1456,20 +1456,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '13',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '13memberof@name.com',
       phone: '(476) 349-96-28'
     },
@@ -1486,20 +1486,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '14',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '14memberofl@name.com',
       phone: '(478) 621-58-93'
     },
@@ -1516,20 +1516,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '15',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '15member of v@name.com',
       phone: '(444) 744-64-66'
     },
@@ -1546,20 +1546,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '16',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '16member@name.com',
       phone: '(418) 528-98-15'
     },
@@ -1576,20 +1576,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '17',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '17memb@name.com',
       phone: '(417) 657-20-33'
     },
@@ -1606,20 +1606,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '18',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '18memberofl@name.com',
       phone: '(442) 630-57-82'
     },
@@ -1636,20 +1636,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '19',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '19membe@name.com',
       phone: '(490) 301-72-75'
     },
@@ -1666,20 +1666,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '20',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '20memb@name.com',
       phone: '(435) 512-60-25'
     },
@@ -1696,20 +1696,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '21',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '21member@name.com',
       phone: '(496) 612-89-46'
     },
@@ -1726,20 +1726,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '22',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '22member @name.com',
       phone: '(489) 547-12-86'
     },
@@ -1756,20 +1756,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '23',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '23member @name.com',
       phone: '(483) 619-80-23'
     },
@@ -1786,20 +1786,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '24',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '24memberof@name.com',
       phone: '(447) 524-59-46'
     },
@@ -1816,20 +1816,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '25',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '25memberof@name.com',
       phone: '(431) 496-14-51'
     },
@@ -1846,20 +1846,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '26',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '26memberof@name.com',
       phone: '(474) 528-87-10'
     },
@@ -1876,20 +1876,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '27',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '27member@name.com',
       phone: '(449) 294-19-67'
     },
@@ -1906,20 +1906,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '28',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '28membe@name.com',
       phone: '(486) 782-14-85'
     },
@@ -1936,20 +1936,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '29',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '29memberof@name.com',
       phone: '(489) 710-72-73'
     },
@@ -1966,20 +1966,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '30',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '30member of v@name.com',
       phone: '(400) 290-62-26'
     },
@@ -1996,20 +1996,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '31',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '31memberof@name.com',
       phone: '(439) 655-65-45'
     },
@@ -2026,20 +2026,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '32',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '32memb@name.com',
       phone: '(415) 356-73-38'
     },
@@ -2056,20 +2056,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '33',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '33membe@name.com',
       phone: '(478) 585-29-83'
     },
@@ -2086,20 +2086,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '34',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '34memberofl@name.com',
       phone: '(499) 462-96-67'
     },
@@ -2116,20 +2116,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '35',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '35memberof@name.com',
       phone: '(464) 621-85-10'
     },
@@ -2146,20 +2146,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '36',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '36memb@name.com',
       phone: '(434) 786-65-88'
     },
@@ -2176,20 +2176,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '37',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '37member of v@name.com',
       phone: '(479) 551-41-93'
     },
@@ -2206,20 +2206,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '38',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '38member@name.com',
       phone: '(446) 168-80-28'
     },
@@ -2236,20 +2236,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '39',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '39member @name.com',
       phone: '(461) 135-98-97'
     },
@@ -2266,20 +2266,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '40',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '40membe@name.com',
       phone: '(473) 413-45-89'
     },
@@ -2296,20 +2296,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '41',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '41member @name.com',
       phone: '(417) 629-46-87'
     },
@@ -2326,20 +2326,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '42',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '42memb@name.com',
       phone: '(449) 249-82-75'
     },
@@ -2356,20 +2356,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '43',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '43member@name.com',
       phone: '(446) 175-37-82'
     },
@@ -2386,20 +2386,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '44',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '44memberofl@name.com',
       phone: '(429) 369-97-96'
     },
@@ -2416,20 +2416,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '45',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '45member of v@name.com',
       phone: '(456) 437-50-14'
     },
@@ -2446,20 +2446,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '46',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '46membe@name.com',
       phone: '(440) 350-34-86'
     },
@@ -2476,20 +2476,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '47',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '47memberof@name.com',
       phone: '(449) 462-66-42'
     },
@@ -2506,20 +2506,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '48',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '48member of v@name.com',
       phone: '(458) 159-97-59'
     },
@@ -2536,20 +2536,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '49',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '49memb@name.com',
       phone: '(463) 381-79-89'
     },
@@ -2566,20 +2566,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '50',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '50memb@name.com',
       phone: '(447) 311-29-11'
     },
@@ -2596,20 +2596,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '51',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '51memb@name.com',
       phone: '(482) 746-82-27'
     },
@@ -2626,20 +2626,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '52',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '52member@name.com',
       phone: '(409) 701-22-78'
     },
@@ -2656,20 +2656,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '53',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '53memberof@name.com',
       phone: '(436) 751-96-67'
     },
@@ -2686,20 +2686,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '54',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '54memberofl@name.com',
       phone: '(417) 595-79-21'
     },
@@ -2716,20 +2716,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '55',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '55memberof@name.com',
       phone: '(428) 335-35-76'
     },
@@ -2746,20 +2746,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '56',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '56membe@name.com',
       phone: '(414) 769-63-23'
     },
@@ -2776,20 +2776,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Matrix,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: 'U',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: 'manageru@name.com',
       phone: '(467) 627-55-53'
     },
@@ -2806,20 +2806,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '0',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '0member @name.com',
       phone: '(469) 343-69-93'
     },
@@ -2836,20 +2836,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '1',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '1memberof@name.com',
       phone: '(480) 422-89-41'
     },
@@ -2866,20 +2866,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '2',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '2memberof@name.com',
       phone: '(441) 696-16-80'
     },
@@ -2896,20 +2896,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '3',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '3memberofl@name.com',
       phone: '(473) 693-54-33'
     },
@@ -2926,20 +2926,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '4',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '4member@name.com',
       phone: '(497) 339-54-54'
     },
@@ -2956,20 +2956,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '5',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '5member@name.com',
       phone: '(426) 672-65-83'
     },
@@ -2986,20 +2986,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '6',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '6member of u@name.com',
       phone: '(455) 704-57-97'
     },
@@ -3016,20 +3016,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '7',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '7memberof@name.com',
       phone: '(472) 529-77-16'
     },
@@ -3046,20 +3046,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '8',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '8member @name.com',
       phone: '(407) 167-80-50'
     },
@@ -3076,20 +3076,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '9',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '9member@name.com',
       phone: '(480) 737-14-47'
     },
@@ -3106,20 +3106,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '10',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '10memberofl@name.com',
       phone: '(400) 647-51-40'
     },
@@ -3136,20 +3136,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '11',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '11member@name.com',
       phone: '(458) 184-63-35'
     },
@@ -3166,20 +3166,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '12',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '12memb@name.com',
       phone: '(436) 730-25-22'
     },
@@ -3196,20 +3196,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '13',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '13member of u@name.com',
       phone: '(448) 313-10-40'
     },
@@ -3226,20 +3226,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '14',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '14memberof@name.com',
       phone: '(436) 218-66-92'
     },
@@ -3256,20 +3256,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '15',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '15memberof@name.com',
       phone: '(474) 433-63-22'
     },
@@ -3286,20 +3286,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '16',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '16memberof@name.com',
       phone: '(458) 235-21-59'
     },
@@ -3316,20 +3316,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '17',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '17member@name.com',
       phone: '(405) 243-21-40'
     },
@@ -3346,20 +3346,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '18',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '18membe@name.com',
       phone: '(483) 442-35-81'
     },
@@ -3376,20 +3376,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '19',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '19member@name.com',
       phone: '(464) 119-18-35'
     },
@@ -3406,20 +3406,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '20',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '20member @name.com',
       phone: '(441) 553-37-58'
     },
@@ -3436,20 +3436,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '21',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '21memberofl@name.com',
       phone: '(475) 140-83-33'
     },
@@ -3466,20 +3466,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '22',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '22member@name.com',
       phone: '(413) 147-66-24'
     },
@@ -3496,20 +3496,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '23',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '23memberofl@name.com',
       phone: '(467) 495-15-30'
     },
@@ -3526,20 +3526,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '24',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '24membe@name.com',
       phone: '(453) 115-65-17'
     },
@@ -3556,20 +3556,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '25',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '25membe@name.com',
       phone: '(405) 662-76-73'
     },
@@ -3586,20 +3586,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '26',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '26membe@name.com',
       phone: '(414) 205-86-62'
     },
@@ -3616,20 +3616,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '27',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '27memberof@name.com',
       phone: '(419) 498-64-14'
     },
@@ -3646,20 +3646,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '28',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '28member @name.com',
       phone: '(437) 603-53-85'
     },
@@ -3676,20 +3676,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '29',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '29memberof@name.com',
       phone: '(403) 488-68-89'
     },
@@ -3706,20 +3706,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '30',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '30memb@name.com',
       phone: '(402) 107-26-11'
     },
@@ -3736,20 +3736,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '31',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '31memberof@name.com',
       phone: '(470) 370-48-19'
     },
@@ -3766,20 +3766,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '32',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '32memb@name.com',
       phone: '(426) 525-92-59'
     },
@@ -3796,20 +3796,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '33',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '33memberofl@name.com',
       phone: '(415) 768-95-12'
     },
@@ -3826,20 +3826,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '34',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '34member @name.com',
       phone: '(402) 184-36-79'
     },
@@ -3856,20 +3856,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '35',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '35membe@name.com',
       phone: '(415) 400-61-69'
     },
@@ -3886,20 +3886,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '36',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '36member @name.com',
       phone: '(420) 410-73-95'
     },
@@ -3916,20 +3916,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Matrix,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: 'O',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: 'manag@name.com',
       phone: '(410) 747-82-44'
     },
@@ -3946,20 +3946,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '0',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '0memberofl@name.com',
       phone: '(447) 725-69-78'
     },
@@ -3976,20 +3976,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '1',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '1memberofl@name.com',
       phone: '(455) 486-45-49'
     },
@@ -4006,20 +4006,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '2',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '2member @name.com',
       phone: '(457) 576-62-89'
     },
@@ -4036,20 +4036,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '3',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '3memberof@name.com',
       phone: '(445) 287-97-94'
     },
@@ -4066,20 +4066,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '4',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '4memberofl@name.com',
       phone: '(451) 384-83-40'
     },
@@ -4096,20 +4096,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '5',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '5member@name.com',
       phone: '(487) 382-53-40'
     },
@@ -4126,20 +4126,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '6',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '6memberofl@name.com',
       phone: '(436) 109-16-41'
     },
@@ -4156,20 +4156,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '7',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '7memberofl@name.com',
       phone: '(422) 391-87-52'
     },
@@ -4186,20 +4186,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '8',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '8memberof@name.com',
       phone: '(475) 658-20-80'
     },
@@ -4216,20 +4216,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '9',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '9member@name.com',
       phone: '(411) 684-85-13'
     },
@@ -4246,20 +4246,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '10',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '10member of o@name.com',
       phone: '(458) 328-73-34'
     },
@@ -4276,20 +4276,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '11',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '11memberof@name.com',
       phone: '(460) 537-39-40'
     },
@@ -4306,20 +4306,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Matrix,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: 'P',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: 'manager@name.com',
       phone: '(420) 609-12-26'
     },
@@ -4336,20 +4336,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '0',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '0membe@name.com',
       phone: '(415) 388-22-97'
     },
@@ -4366,20 +4366,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '1',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '1memberof@name.com',
       phone: '(462) 112-50-18'
     },
@@ -4396,20 +4396,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '2',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '2member@name.com',
       phone: '(402) 155-16-27'
     },
@@ -4426,20 +4426,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '3',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '3member @name.com',
       phone: '(406) 400-15-28'
     },
@@ -4456,20 +4456,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '4',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '4memberof@name.com',
       phone: '(442) 610-28-53'
     },
@@ -4486,20 +4486,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '5',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '5member of p@name.com',
       phone: '(482) 699-52-78'
     },
@@ -4516,20 +4516,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '6',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '6memberofl@name.com',
       phone: '(407) 610-19-50'
     },
@@ -4546,20 +4546,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '7',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '7memberof@name.com',
       phone: '(412) 363-39-61'
     },
@@ -4576,20 +4576,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '8',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '8member of p@name.com',
       phone: '(451) 414-34-55'
     },
@@ -4606,20 +4606,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '9',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '9memberofl@name.com',
       phone: '(401) 533-77-39'
     },
@@ -4636,20 +4636,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '10',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '10member @name.com',
       phone: '(405) 154-23-24'
     },
@@ -4666,20 +4666,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '11',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '11member of p@name.com',
       phone: '(429) 459-86-82'
     },
@@ -4696,20 +4696,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '12',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '12memb@name.com',
       phone: '(456) 774-82-59'
     },
@@ -4726,20 +4726,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '13',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '13memberof@name.com',
       phone: '(469) 646-78-94'
     },
@@ -4756,20 +4756,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '14',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '14memb@name.com',
       phone: '(441) 710-13-31'
     },
@@ -4786,20 +4786,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '15',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '15memberofl@name.com',
       phone: '(415) 328-22-77'
     },
@@ -4816,20 +4816,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '16',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '16memb@name.com',
       phone: '(443) 182-67-61'
     },
@@ -4846,20 +4846,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '17',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '17memberofl@name.com',
       phone: '(493) 363-19-54'
     },
@@ -4876,20 +4876,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '18',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '18member @name.com',
       phone: '(450) 338-51-61'
     },
@@ -4906,20 +4906,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '19',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '19memberofl@name.com',
       phone: '(463) 651-87-15'
     },
@@ -4936,20 +4936,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '20',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '20membe@name.com',
       phone: '(403) 621-53-16'
     },
@@ -4966,20 +4966,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '21',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '21member @name.com',
       phone: '(468) 141-91-23'
     },
@@ -4996,20 +4996,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '22',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '22memberof@name.com',
       phone: '(494) 572-60-83'
     },
@@ -5026,20 +5026,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '23',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '23memb@name.com',
       phone: '(431) 309-36-71'
     },
@@ -5056,20 +5056,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Matrix,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: 'L',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: 'manag@name.com',
       phone: '(435) 497-51-23'
     },
@@ -5086,20 +5086,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '0',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '0memberofl@name.com',
       phone: '(499) 101-99-96'
     },
@@ -5116,20 +5116,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '1',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '1member @name.com',
       phone: '(413) 401-77-89'
     },
@@ -5146,20 +5146,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '2',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '2memberofl@name.com',
       phone: '(474) 372-75-51'
     },
@@ -5176,20 +5176,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '3',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '3memberof@name.com',
       phone: '(486) 580-56-83'
     },
@@ -5206,20 +5206,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '4',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '4memberofl@name.com',
       phone: '(486) 796-88-90'
     },
@@ -5236,20 +5236,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '5',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '5member @name.com',
       phone: '(435) 732-26-60'
     },
@@ -5266,20 +5266,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '6',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '6membe@name.com',
       phone: '(467) 628-21-36'
     },
@@ -5296,20 +5296,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '7',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '7memberofl@name.com',
       phone: '(462) 785-11-12'
     },
@@ -5326,20 +5326,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '8',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '8memberof@name.com',
       phone: '(449) 493-16-78'
     },
@@ -5356,20 +5356,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '9',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '9memberof@name.com',
       phone: '(446) 698-13-14'
     },
@@ -5386,20 +5386,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '10',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '10memberof@name.com',
       phone: '(415) 619-46-54'
     },
@@ -5416,20 +5416,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '11',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '11memberofl@name.com',
       phone: '(412) 581-72-63'
     },
@@ -5446,20 +5446,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '12',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '12membe@name.com',
       phone: '(465) 394-89-49'
     },
@@ -5476,20 +5476,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '13',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '13memberofl@name.com',
       phone: '(420) 525-71-38'
     },
@@ -5506,20 +5506,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '14',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '14memberofl@name.com',
       phone: '(479) 795-87-65'
     },
@@ -5536,20 +5536,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '15',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '15memberof@name.com',
       phone: '(441) 766-58-45'
     },
@@ -5566,20 +5566,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '16',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '16memberof@name.com',
       phone: '(425) 716-41-61'
     },
@@ -5596,20 +5596,20 @@ module.exports = {
       groupTitleColor: '#4169e1',
       isVisible: true,
       isActive: true,
-      hasSelectorCheckbox: primitives.common.Enabled.Auto,
-      hasButtons: primitives.common.Enabled.Auto,
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Auto,
-      childrenPlacementType: primitives.orgdiagram.ChildrenPlacementType.Auto,
+      hasSelectorCheckbox: Enabled.Auto,
+      hasButtons: Enabled.Auto,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Auto,
+      childrenPlacementType: ChildrenPlacementType.Auto,
       groupName: null,
       templateName: null,
-      showCallout: primitives.common.Enabled.Auto,
+      showCallout: Enabled.Auto,
       calloutTemplateName: null,
       label: '17',
-      showLabel: primitives.common.Enabled.Auto,
+      showLabel: Enabled.Auto,
       labelSize: null,
-      labelOrientation: primitives.text.TextOrientationType.Auto,
-      labelPlacement: primitives.common.PlacementType.Auto,
+      labelOrientation: TextOrientationType.Auto,
+      labelPlacement: PlacementType.Auto,
       email: '17memberof@name.com',
       phone: '(466) 235-19-63'
     }
diff --git a/server/src/services/demoorganizationalcharts/data/partners.js b/server/src/services/demoorganizationalcharts/data/partners.js
index e789b92..bd50ef0 100644
--- a/server/src/services/demoorganizationalcharts/data/partners.js
+++ b/server/src/services/demoorganizationalcharts/data/partners.js
@@ -1,4 +1,6 @@
-const primitives = require('basicprimitives');
+const { Colors, ItemType, AdviserPlacementType, ChildrenPlacementType,
+  LineType, AnnotationType, ZOrderType, ConnectorShapeType, ConnectorPlacementType,
+  ConnectorLabelPlacementType, Thickness } = require('basicprimitives');
 
 module.exports = {
   items: [
@@ -9,7 +11,7 @@ module.exports = {
       description: 'Regular root item',
       image: '/api/images/photos/r.png',
       groupTitle: 'Has Partners',
-      groupTitleColor: primitives.common.Colors.Red,
+      groupTitleColor: Colors.Red,
       email: 'root@name.com',
       phone: '648-123-12-12'
     },
@@ -19,9 +21,9 @@ module.exports = {
       title: 'GP 1',
       description: 'General Partner on right',
       image: '/api/images/photos/g.png',
-      itemType: primitives.orgdiagram.ItemType.GeneralPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      groupTitleColor: primitives.common.Colors.Green,
+      itemType: ItemType.GeneralPartner,
+      adviserPlacementType: AdviserPlacementType.Right,
+      groupTitleColor: Colors.Green,
       groupTitle: 'Partner',
       email: 'gp1@name.com',
       phone: '648-123-12-13'
@@ -32,8 +34,8 @@ module.exports = {
       title: 'LP 2',
       description: 'Limited Partner on right',
       image: '/api/images/photos/l.png',
-      itemType: primitives.orgdiagram.ItemType.LimitedPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.LimitedPartner,
+      adviserPlacementType: AdviserPlacementType.Right,
       groupTitle: 'Partner',
       email: 'lp2@name.com',
       phone: '648-123-12-14'
@@ -44,8 +46,8 @@ module.exports = {
       title: 'LP 3',
       description: 'Limited Partner on left',
       image: '/api/images/photos/l.png',
-      itemType: primitives.orgdiagram.ItemType.LimitedPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Left,
+      itemType: ItemType.LimitedPartner,
+      adviserPlacementType: AdviserPlacementType.Left,
       groupTitle: 'Partner',
       email: 'lp3@name.com',
       phone: '648-123-12-15'
@@ -65,9 +67,9 @@ module.exports = {
       title: 'Adviser 5',
       description: 'Adviser on right',
       image: '/api/images/photos/a.png',
-      itemType: primitives.orgdiagram.ItemType.Adviser,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      groupTitleColor: primitives.common.Colors.Red,
+      itemType: ItemType.Adviser,
+      adviserPlacementType: AdviserPlacementType.Right,
+      groupTitleColor: Colors.Red,
       groupTitle: 'Has Partners',
       email: 'adviser5@name.com',
       phone: '648-123-12-17'
@@ -78,9 +80,9 @@ module.exports = {
       title: 'GP 6',
       description: 'General Partner on right',
       image: '/api/images/photos/g.png',
-      itemType: primitives.orgdiagram.ItemType.GeneralPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      groupTitleColor: primitives.common.Colors.Green,
+      itemType: ItemType.GeneralPartner,
+      adviserPlacementType: AdviserPlacementType.Right,
+      groupTitleColor: Colors.Green,
       groupTitle: 'Partner',
       email: 'gp6@name.com',
       phone: '648-123-12-18'
@@ -91,9 +93,9 @@ module.exports = {
       title: 'Regular 7',
       description: 'Regular',
       image: '/api/images/photos/r.png',
-      childrenPlacementType: primitives.common.ChildrenPlacementType.Matrix,
+      childrenPlacementType: ChildrenPlacementType.Matrix,
       groupTitle: 'Has Partners',
-      groupTitleColor: primitives.common.Colors.Red,
+      groupTitleColor: Colors.Red,
       email: 'regular7@name.com',
       phone: '648-123-12-19'
     },
@@ -103,8 +105,8 @@ module.exports = {
       title: 'LP 8',
       description: 'Limited Partner on the right',
       image: '/api/images/photos/l.png',
-      itemType: primitives.orgdiagram.ItemType.LimitedPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.LimitedPartner,
+      adviserPlacementType: AdviserPlacementType.Right,
       groupTitle: 'Partner',
       email: 'lp8@name.com',
       phone: '648-123-12-20'
@@ -115,8 +117,8 @@ module.exports = {
       title: 'Assistant 9',
       description: 'Assistant having its own partner node',
       image: '/api/images/photos/r.png',
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Left,
+      itemType: ItemType.Assistant,
+      adviserPlacementType: AdviserPlacementType.Left,
       email: 'assistant9@name.com',
       phone: '648-123-12-21'
     },
@@ -126,9 +128,9 @@ module.exports = {
       title: 'Adviser 10',
       description: 'Adviser on the left',
       image: '/api/images/photos/a.png',
-      itemType: primitives.orgdiagram.ItemType.Adviser,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Left,
-      groupTitleColor: primitives.common.Colors.Red,
+      itemType: ItemType.Adviser,
+      adviserPlacementType: AdviserPlacementType.Left,
+      groupTitleColor: Colors.Red,
       groupTitle: 'Has Partners',
       email: 'adviser10@name.com',
       phone: '648-123-12-22'
@@ -139,9 +141,9 @@ module.exports = {
       title: 'GP 11',
       description: 'General Partner on right',
       image: '/api/images/photos/g.png',
-      itemType: primitives.orgdiagram.ItemType.GeneralPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      groupTitleColor: primitives.common.Colors.Green,
+      itemType: ItemType.GeneralPartner,
+      adviserPlacementType: AdviserPlacementType.Right,
+      groupTitleColor: Colors.Green,
       groupTitle: 'Partner',
       email: 'gp11@name.com',
       phone: '648-123-12-23'
@@ -152,9 +154,9 @@ module.exports = {
       title: 'GP 12',
       description: 'General Partner on right',
       image: '/api/images/photos/g.png',
-      itemType: primitives.orgdiagram.ItemType.GeneralPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      groupTitleColor: primitives.common.Colors.Green,
+      itemType: ItemType.GeneralPartner,
+      adviserPlacementType: AdviserPlacementType.Right,
+      groupTitleColor: Colors.Green,
       groupTitle: 'Partner',
       email: 'gp12@name.com',
       phone: '648-123-12-24'
@@ -165,10 +167,10 @@ module.exports = {
       title: 'Adviser 13',
       description: 'Adviser',
       image: '/api/images/photos/a.png',
-      itemType: primitives.orgdiagram.ItemType.Adviser,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.Adviser,
+      adviserPlacementType: AdviserPlacementType.Right,
       groupTitle: 'Has Partners',
-      groupTitleColor: primitives.common.Colors.Red,
+      groupTitleColor: Colors.Red,
       email: 'adviser13@name.com',
       phone: '648-123-12-25'
     },
@@ -178,9 +180,9 @@ module.exports = {
       title: 'GP 14',
       description: 'General Partner on right',
       image: '/api/images/photos/g.png',
-      itemType: primitives.orgdiagram.ItemType.GeneralPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      groupTitleColor: primitives.common.Colors.Green,
+      itemType: ItemType.GeneralPartner,
+      adviserPlacementType: AdviserPlacementType.Right,
+      groupTitleColor: Colors.Green,
       groupTitle: 'Partner',
       email: 'gp14@name.com',
       phone: '648-123-12-26'
@@ -191,8 +193,8 @@ module.exports = {
       title: 'Adviser 15',
       description: 'Adviser',
       image: '/api/images/photos/a.png',
-      itemType: primitives.orgdiagram.ItemType.Adviser,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.Adviser,
+      adviserPlacementType: AdviserPlacementType.Right,
       email: 'adviser15@name.com',
       phone: '648-123-12-27'
     },
@@ -202,7 +204,7 @@ module.exports = {
       title: 'Regular 16',
       description: 'Regular',
       image: '/api/images/photos/r.png',
-      childrenPlacementType: primitives.common.ChildrenPlacementType.Matrix,
+      childrenPlacementType: ChildrenPlacementType.Matrix,
       email: 'regular16@name.com',
       phone: '648-123-12-28'
     },
@@ -212,7 +214,7 @@ module.exports = {
       title: 'Regular 17',
       description: 'Regular',
       image: '/api/images/photos/r.png',
-      itemType: primitives.orgdiagram.ItemType.Regular /* We explisitly set iteType of regular item */,
+      itemType: ItemType.Regular /* We explisitly set iteType of regular item */,
       email: 'regular17@name.com',
       phone: '648-123-12-29'
     },
@@ -222,8 +224,8 @@ module.exports = {
       title: 'Assistant 18',
       description: 'Assistant item on right',
       image: '/api/images/photos/s.png',
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.Assistant,
+      adviserPlacementType: AdviserPlacementType.Right,
       email: 'assistant18@name.com',
       phone: '648-123-12-30'
     },
@@ -233,8 +235,8 @@ module.exports = {
       title: 'Assistant 19',
       description: 'Assistant item on right',
       image: '/api/images/photos/s.png',
-      itemType: primitives.orgdiagram.ItemType.Regular,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.Regular,
+      adviserPlacementType: AdviserPlacementType.Right,
       email: 'assistant19@name.com',
       phone: '648-123-12-31'
     },
@@ -244,9 +246,9 @@ module.exports = {
       title: 'GP 20',
       description: 'General Partner on right',
       image: '/api/images/photos/g.png',
-      itemType: primitives.orgdiagram.ItemType.GeneralPartner,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
-      groupTitleColor: primitives.common.Colors.Green,
+      itemType: ItemType.GeneralPartner,
+      adviserPlacementType: AdviserPlacementType.Right,
+      groupTitleColor: Colors.Green,
       groupTitle: 'Partner',
       email: 'gp20@name.com',
       phone: '648-123-12-32'
@@ -257,8 +259,8 @@ module.exports = {
       title: 'Assistant 21',
       description: 'Assistant item on right',
       image: '/api/images/photos/s.png',
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.Assistant,
+      adviserPlacementType: AdviserPlacementType.Right,
       email: 'assistant21@name.com',
       phone: '648-123-12-32'
     },
@@ -268,7 +270,7 @@ module.exports = {
       title: 'Regular 22',
       description: 'Regular item assigned to Partner is shown as its Assistant.',
       image: '/api/images/photos/r.png',
-      itemType: primitives.orgdiagram.ItemType.Regular,
+      itemType: ItemType.Regular,
       email: 'regular22@name.com',
       phone: '648-123-12-33'
     },
@@ -278,7 +280,7 @@ module.exports = {
       title: 'Regular 23',
       description: 'Regular item assigned to assistant.',
       image: '/api/images/photos/r.png',
-      itemType: primitives.orgdiagram.ItemType.Regular,
+      itemType: ItemType.Regular,
       email: 'regular23@name.com',
       phone: '648-123-12-34'
     },
@@ -288,7 +290,7 @@ module.exports = {
       title: 'Regular 24',
       description: 'Regular item assigned to assistant.',
       image: '/api/images/photos/r.png',
-      itemType: primitives.orgdiagram.ItemType.Regular,
+      itemType: ItemType.Regular,
       email: 'regular24@name.com',
       phone: '648-123-12-35'
     },
@@ -298,7 +300,7 @@ module.exports = {
       title: 'Regular 25',
       description: 'Regular item assigned to assistant.',
       image: '/api/images/photos/r.png',
-      itemType: primitives.orgdiagram.ItemType.Regular,
+      itemType: ItemType.Regular,
       email: 'regular25@name.com',
       phone: '648-123-12-36'
     },
@@ -310,8 +312,8 @@ module.exports = {
       title: 'Adviser 26',
       description: 'Adviser on left',
       image: '/api/images/photos/a.png',
-      itemType: primitives.orgdiagram.ItemType.Adviser,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Left,
+      itemType: ItemType.Adviser,
+      adviserPlacementType: AdviserPlacementType.Left,
       email: 'regular26@name.com',
       phone: '648-123-12-37'
     },
@@ -321,8 +323,8 @@ module.exports = {
       title: 'Adviser 27',
       description: 'Adviser on right',
       image: '/api/images/photos/a.png',
-      itemType: primitives.orgdiagram.ItemType.Adviser,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.Adviser,
+      adviserPlacementType: AdviserPlacementType.Right,
       email: 'regular27@name.com',
       phone: '648-123-12-38'
     },
@@ -332,8 +334,8 @@ module.exports = {
       title: 'Assistant 28',
       description: 'Assistant on right',
       image: '/api/images/photos/s.png',
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Right,
+      itemType: ItemType.Assistant,
+      adviserPlacementType: AdviserPlacementType.Right,
       email: 'assistant28@name.com',
       phone: '648-123-12-39'
     },
@@ -343,8 +345,8 @@ module.exports = {
       title: 'Assistant 29',
       description: 'Assistant on left',
       image: '/api/images/photos/s.png',
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      adviserPlacementType: primitives.common.AdviserPlacementType.Left,
+      itemType: ItemType.Assistant,
+      adviserPlacementType: AdviserPlacementType.Left,
       email: 'assistant29@name.com',
       phone: '648-123-12-40'
     },
@@ -507,64 +509,64 @@ module.exports = {
   ],
   annotations: [
     {
-      annotationType: primitives.common.AnnotationType.Connector,
-      zOrderType: primitives.common.ZOrderType.Foreground,
+      annotationType: AnnotationType.Connector,
+      zOrderType: ZOrderType.Foreground,
       fromItem: 31,
       toItem: 7,
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
-      labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
-      offset: new primitives.common.Thickness(0, 0, 0, 0),
+      connectorShapeType: ConnectorShapeType.OneWay,
+      connectorPlacementType: ConnectorPlacementType.Offbeat,
+      labelPlacementType: ConnectorLabelPlacementType.Between,
+      offset: new Thickness(0, 0, 0, 0),
       lineWidth: 2,
       color: '#ff0000',
-      lineType: primitives.common.LineType.Dashed,
+      lineType: LineType.Dashed,
       selectItems: false,
       label: { color: "green", badge: "1", title: "Parent"},
       labelSize: { width: 70, height: 30 }
     },
     {
-      annotationType: primitives.common.AnnotationType.Background,
+      annotationType: AnnotationType.Background,
       items: [30, 31, 32, 33, 34, 37, 38, 39, 40, 41, 42, 18, 19],
       borderColor: '#f8e5f9',
       fillColor: '#e5f9f8',
       lineWidth: 2,
       selectItems: true,
-      lineType: primitives.common.LineType.Solid
+      lineType: LineType.Solid
     },
     {
-      annotationType: primitives.common.AnnotationType.Background,
+      annotationType: AnnotationType.Background,
       items: [21, 22, 23, 24, 25],
       borderColor: '#ccffb3',
       fillColor: '#effda4',
       lineWidth: 2,
       selectItems: false,
-      lineType: primitives.common.LineType.Solid
+      lineType: LineType.Solid
     },
     {
-      annotationType: primitives.common.AnnotationType.Background,
+      annotationType: AnnotationType.Background,
       items: [13, 14],
       borderColor: '#e3c5ad',
       fillColor: '#f6eeeb',
       lineWidth: 2,
       selectItems: true,
       includeChildren: true,
-      lineType: primitives.common.LineType.Solid
+      lineType: LineType.Solid
     },
     {
-      annotationType: primitives.common.AnnotationType.HighlightPath,
+      annotationType: AnnotationType.HighlightPath,
       items: [41, 3],
       selectItems: true,
-      color: primitives.common.Colors.Black,
+      color: Colors.Black,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Solid
+      lineType: LineType.Solid
     },
     {
-      annotationType: primitives.common.AnnotationType.HighlightPath,
+      annotationType: AnnotationType.HighlightPath,
       items: [35, 1],
       selectItems: true,
-      color: primitives.common.Colors.Red,
+      color: Colors.Red,
       lineWidth: 2,
-      lineType: primitives.common.LineType.Solid
+      lineType: LineType.Solid
     }
   ]
 };
diff --git a/server/src/services/demoorganizationalcharts/data/smalldataset.js b/server/src/services/demoorganizationalcharts/data/smalldataset.js
index e5a0572..2f8d40d 100644
--- a/server/src/services/demoorganizationalcharts/data/smalldataset.js
+++ b/server/src/services/demoorganizationalcharts/data/smalldataset.js
@@ -1,4 +1,4 @@
-const primitives = require('basicprimitives');
+const { Colors, ConnectorShapeType, LineType } = require('basicprimitives');
 
 module.exports = {
   items: [
@@ -1939,157 +1939,157 @@ module.exports = {
     {
       fromItem: 0,
       toItem: 148,
-      color: primitives.common.Colors.Red,
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Red,
+      connectorShapeType: ConnectorShapeType.OneWay,
+      lineType: LineType.Dashed
     },
     {
       fromItem: 0,
       toItem: 150,
-      color: primitives.common.Colors.Blue,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dotted
+      color: Colors.Blue,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dotted
     },
     {
       fromItem: 0,
       toItem: 90,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.TwoWay,
-      lineType: primitives.common.LineType.Solid
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.TwoWay,
+      lineType: LineType.Solid
     },
     {
       fromItem: 0,
       toItem: 75,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Solid
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Solid
     },
     {
       fromItem: 75,
       toItem: 90,
-      color: primitives.common.Colors.Red,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Red,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dashed
     },
     {
       fromItem: 75,
       toItem: 90,
-      color: primitives.common.Colors.Blue,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Blue,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dashed
     },
     {
       fromItem: 75,
       toItem: 90,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Solid
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Solid
     },
     {
       fromItem: 1,
       toItem: 45,
-      color: primitives.common.Colors.Blue,
-      connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Blue,
+      connectorShapeType: ConnectorShapeType.OneWay,
+      lineType: LineType.Dashed
     },
     {
       fromItem: 1,
       toItem: 75,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.TwoWay,
-      lineType: primitives.common.LineType.Solid
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.TwoWay,
+      lineType: LineType.Solid
     },
     {
       fromItem: 1,
       toItem: 90,
-      color: primitives.common.Colors.Cyan,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Cyan,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dashed
     },
 
     {
       fromItem: 148,
       toItem: 149,
-      color: primitives.common.Colors.Blue,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Solid
+      color: Colors.Blue,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Solid
     },
     {
       fromItem: 148,
       toItem: 149,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dotted
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dotted
     },
     {
       fromItem: 90,
       toItem: 149,
-      color: primitives.common.Colors.Blue,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Solid
+      color: Colors.Blue,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Solid
     },
     {
       fromItem: 149,
       toItem: 90,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dotted
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dotted
     },
     {
       fromItem: 150,
       toItem: 149,
-      color: primitives.common.Colors.Blue,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Solid
+      color: Colors.Blue,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Solid
     },
     {
       fromItem: 149,
       toItem: 150,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dotted
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dotted
     },
     {
       fromItem: 156,
       toItem: 149,
-      color: primitives.common.Colors.Blue,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Solid
+      color: Colors.Blue,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Solid
     },
     {
       fromItem: 149,
       toItem: 156,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.TwoWay,
-      lineType: primitives.common.LineType.Dotted
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.TwoWay,
+      lineType: LineType.Dotted
     },
     {
       fromItem: 75,
       toItem: 52,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dashed
     },
     {
       fromItem: 52,
       toItem: 63,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dashed
     },
     {
       fromItem: 63,
       toItem: 79,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dashed
     },
     {
       fromItem: 63,
       toItem: 40,
-      color: primitives.common.Colors.Green,
-      connectorShapeType: primitives.common.ConnectorShapeType.BothWay,
-      lineType: primitives.common.LineType.Dashed
+      color: Colors.Green,
+      connectorShapeType: ConnectorShapeType.BothWay,
+      lineType: LineType.Dashed
     }
   ]
 };
diff --git a/server/src/services/demoorganizationalcharts/data/verticallayoutorganizationalchart.js b/server/src/services/demoorganizationalcharts/data/verticallayoutorganizationalchart.js
index 6e15d4d..acf5a4d 100644
--- a/server/src/services/demoorganizationalcharts/data/verticallayoutorganizationalchart.js
+++ b/server/src/services/demoorganizationalcharts/data/verticallayoutorganizationalchart.js
@@ -1,4 +1,4 @@
-const primitives = require('basicprimitives');
+const { Size, PlacementType, ItemType } = require('basicprimitives');
 
 module.exports = {
   items: [
@@ -14,8 +14,8 @@ module.exports = {
       phone: '1-900-800-70-60',
       title: 'Title A',
       templateName: 'managerTemplate',
-      labelSize: new primitives.common.Size(300, 14),
-      labelPlacement: primitives.common.PlacementType.Right,
+      labelSize: new Size(300, 14),
+      labelPlacement: PlacementType.Right,
       groupTitle: "Root"
     },
     {
@@ -27,7 +27,7 @@ module.exports = {
       image: '/api/images/photos/z.png',
       title: 'Adviser 1',
       label: 'Adviser 1',
-      itemType: primitives.orgdiagram.ItemType.Adviser
+      itemType: ItemType.Adviser
     },
     {
       id: 2,
@@ -38,7 +38,7 @@ module.exports = {
       image: '/api/images/photos/z.png',
       title: 'Adviser 2',
       label: 'Adviser 2',
-      itemType: primitives.orgdiagram.ItemType.Adviser
+      itemType: ItemType.Adviser
     },
     {
       id: 3,
@@ -49,9 +49,9 @@ module.exports = {
       image: '/api/images/photos/y.png',
       title: 'Assistant 1',
       label: 'Assistant 1',
-      itemType: primitives.orgdiagram.ItemType.Assistant,
-      labelSize: new primitives.common.Size(300, 14),
-      labelPlacement: primitives.common.PlacementType.Right
+      itemType: ItemType.Assistant,
+      labelSize: new Size(300, 14),
+      labelPlacement: PlacementType.Right
     },
     /* managers */
     {
@@ -66,8 +66,8 @@ module.exports = {
       title: 'Manager E',
       label: 'Manager E',
       templateName: 'managerTemplate',
-      labelSize: new primitives.common.Size(300, 14),
-      labelPlacement: primitives.common.PlacementType.Right
+      labelSize: new Size(300, 14),
+      labelPlacement: PlacementType.Right
     },
     {
       id: 20,
@@ -81,8 +81,8 @@ module.exports = {
       title: 'Manager V',
       label: 'Manager V',
       templateName: 'managerTemplate',
-      labelSize: new primitives.common.Size(300, 14),
-      labelPlacement: primitives.common.PlacementType.Right
+      labelSize: new Size(300, 14),
+      labelPlacement: PlacementType.Right
     },
     {
       id: 38,
@@ -96,8 +96,8 @@ module.exports = {
       title: 'Manager U',
       label: 'Manager U',
       templateName: 'managerTemplate',
-      labelSize: new primitives.common.Size(300, 14),
-      labelPlacement: primitives.common.PlacementType.Right
+      labelSize: new Size(300, 14),
+      labelPlacement: PlacementType.Right
     },
     {
       id: 57,
@@ -111,8 +111,8 @@ module.exports = {
       title: 'Manager O',
       label: 'Manager O',
       templateName: 'managerTemplate',
-      labelSize: new primitives.common.Size(300, 14),
-      labelPlacement: primitives.common.PlacementType.Right
+      labelSize: new Size(300, 14),
+      labelPlacement: PlacementType.Right
     },
     {
       id: 73,
@@ -126,8 +126,8 @@ module.exports = {
       title: 'Manager P',
       label: 'Manager P',
       templateName: 'managerTemplate',
-      labelSize: new primitives.common.Size(300, 14),
-      labelPlacement: primitives.common.PlacementType.Right
+      labelSize: new Size(300, 14),
+      labelPlacement: PlacementType.Right
     },
     {
       id: 90,
@@ -141,8 +141,8 @@ module.exports = {
       title: 'Manager L',
       label: 'Manager L',
       templateName: 'managerTemplate',
-      labelSize: new primitives.common.Size(300, 14),
-      labelPlacement: primitives.common.PlacementType.Right
+      labelSize: new Size(300, 14),
+      labelPlacement: PlacementType.Right
     },
     /* direct reports */
     {
diff --git a/server/src/services/howtouse/index.js b/server/src/services/howtouse/index.js
index ad240b2..9adbd2a 100644
--- a/server/src/services/howtouse/index.js
+++ b/server/src/services/howtouse/index.js
@@ -40,7 +40,8 @@ module.exports = function customService(app) {
 
   app.use('/images', express.static(path.join(__dirname, '..', '..', 'static', 'javascript', 'samples', 'images')));
   app.use('/images', express.static(path.join(__dirname, '..', '..', 'static', 'react', 'docs', 'images')));
-  app.use('/min', express.static(path.join(__dirname, '..', '..', 'static', 'javascript', 'min')));
-  app.use('/packages', express.static(path.join(__dirname, '..', '..', 'static', 'javascript', 'packages')));
+  app.use('/javascript', express.static(path.join(__dirname, '..', '..', 'static', 'javascript')));
+  app.use('/javascript', express.static(path.join(__dirname, '..', '..', 'static', 'javascript' , 'dist')));
+  app.use('/javascript', express.static(path.join(__dirname, '..', '..', 'static', 'javascript')));
   app.use('/data', express.static(path.join(__dirname, '..', '..', 'static', 'javascript', 'samples', 'data')));
 }
diff --git a/server/src/services/howtouse/markdown.js b/server/src/services/howtouse/markdown.js
index 6e19353..3de1822 100644
--- a/server/src/services/howtouse/markdown.js
+++ b/server/src/services/howtouse/markdown.js
@@ -53,6 +53,7 @@ async function getMarkdownFileContent(name) {
     fileContent = (await readFile(filePath)).toString();
     fileContent = fileContent.replace(/(samples\/images)/g, match => 'api/images');    
     fileContent = fileContent.replace(/(\(images)/g, match => '(api/images');
+    fileContent = fileContent.replace(/(\(\.\/images)/g, match => '(api/images');
   }
   return fileContent;
 }
@@ -70,10 +71,9 @@ async function getSampleFileContent(link) {
   if (fileContent.charCodeAt(0) === 0xfeff) {
     fileContent = fileContent.substr(1);
   }
-  // remove SSI command used for package primary library development.
-  fileContent = fileContent.replace(/<!-- # include file="\.\.\/\.\.\/src\.primitives\/src\.primitives\.html"-->/g, match => '');
-  fileContent = fileContent.replace(/(\.\.\/\.\.\/packages)/g, match => '/api/packages');
-  fileContent = fileContent.replace(/(\.\.\/\.\.\/min)/g, match => '/api/min');
+  fileContent = fileContent.replace(/(\.\.\/\.\.\/primitives.js)/g, match => '/api/javascript/primitives.js');
+  fileContent = fileContent.replace(/(\.\.\/\.\.\/pdfkitsamples.js)/g, match => '/api/javascript/pdfkitsamples.js');
+  fileContent = fileContent.replace(/(\.\.\/\.\.\/css)/g, match => '/api/javascript/css');
   fileContent = fileContent.replace(/(\.\.\/images\/photos)/g, match => '/api/images/photos');
   fileContent = fileContent.replace(/(\.\.\/data\/photos)/g, match => '/api/data/photos');
   fileContent = fileContent.replace(/(\'photos)/g, match => '\'/photos');
diff --git a/server/src/static/downloads.md b/server/src/static/downloads.md
index fe96fee..dffc5bb 100644
--- a/server/src/static/downloads.md
+++ b/server/src/static/downloads.md
@@ -1,12 +1,12 @@
 # Downloads
 
 ## Basic Primitives Diagrams for JavaScript
-Basic Primitives Diagrams for JavaScript - components library that implements organizational and multi-parent hierarchical charts, contains implementations of JavaScript Controls, jQuery UI Widgets and PDFkit plugins. Markdown API reference.
+Basic Primitives Diagrams for JavaScript - components library that implements organizational and multi-parent hierarchical charts, contains implementations of JavaScript Controls and PDFkit plugins. Markdown API reference.
 
-[Download](files/BasicPrimitives5.zip) [npm package](https://www.npmjs.com/package/basicprimitives) [GitHub](https://github.com/BasicPrimitives/javascript) [GitHub Deployment](https://basicprimitives.github.io/javascript/)
+[Download](files/BasicPrimitives6.zip) [npm package](https://www.npmjs.com/package/basicprimitives) [GitHub](https://github.com/BasicPrimitives/javascript) [GitHub Deployment](https://basicprimitives.github.io/javascript/)
 
 ## Basic Primitives Diagrams for JavaScript Demos
-JavaScript Controls, jQuery UI Widgets, PDFKit plugins and AngularJS Directive Samples & Demos
+JavaScript Controls, Bootstrap 5.0, PDFKit plugins and AngularJS Directive Samples & Demos
 * Large Hierarchical Chart navigation demo
 * Vertical & Matrix Organizational Chart layout demos
 * Client side PDF generation demo.
@@ -44,20 +44,3 @@ Components library that implements organizational and multi-parent hierarchical
 
 [Download](files/BasicPrimitivesDiagramsReactDemo.zip) [GitHub](https://github.com/BasicPrimitives/react-demo)
 
-## Basic Primitives Diagrams ASP.NET MVC Sample
-Basic Primitives ASP.NET MVC Sample - rendering of Basic Primitives First Organizational Chart on ASP.NET MVC page
-
-[Download](files/BasicPrimitivesAspNetMvcSample.zip)
-
-## Basic Primitives Diagrams ASP.NET Sample
-
-Basic Primitives ASP.NET 3.5 custom control Demo. jQuery UI Widget based control visualizes hierarchical structure in form of organizational chart using default or user defined client side JavaScript templates.
-
-**Warning! This sample is no longer being updated.**
-
-ASP.NET Web Form application should include next JavaScript files: jquery-1.7.2.js, jquery.json-2.3.min.js, jquery-ui-1.8.16.custom.min.js and css file: jquery-ui-1.8.16.custom.css
-ASP.NET Web Form application must contain AJAX "ScriptManager" component.
-Please rebuild project in order to see control in Visual Studio toolbox. Design time preview is not implemented, but control's API is complete.
-It has next major features:
-
-[Download](files/BasicPrimitivesAspNetSample.zip)
diff --git a/server/src/static/javascript b/server/src/static/javascript
index eea089b..57bcf49 160000
--- a/server/src/static/javascript
+++ b/server/src/static/javascript
@@ -1 +1 @@
-Subproject commit eea089bd11c58dc821ba7983caa0ca7fe9bf3d76
+Subproject commit 57bcf49ed098984402adbea234e9bd8451ff6b82
diff --git a/server/yarn.lock b/server/yarn.lock
index 8361aee..0ffac66 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -204,13 +204,6 @@ ansi-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 array-filter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
@@ -275,18 +268,10 @@ basic-auth@~2.0.1:
   dependencies:
     safe-buffer "5.1.2"
 
-basicprimitives@5.9.2, basicprimitives@^5.9.2:
-  version "5.9.2"
-  resolved "https://registry.yarnpkg.com/basicprimitives/-/basicprimitives-5.9.2.tgz#1037f6a4e936c7fe15556900e891500fc2bde32d"
-  integrity sha512-bH48OPScxPdsVhI6ZBncgpAwRCt4qrx1r+lpcmpp4is6F1RpsGRF+maq2FbaI4LglaTxrcTsZ7dEEMYhy12YSg==
-
-basicprimitivesreact@^5.9.3:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/basicprimitivesreact/-/basicprimitivesreact-5.9.3.tgz#e892d55dccbb2c59223c665a5cf62f5f7f183308"
-  integrity sha512-Ic8UK9PAwIp9cgmPesgHRjNKJDQ1hZAtfr8iiuTRH4ph+rcPYGpHJKYmIraZ1D+KiBFZU91ynV4LP/l2DWjF+w==
-  dependencies:
-    basicprimitives "5.9.2"
-    resize-observer-polyfill "^1.5.1"
+basicprimitives@6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/basicprimitives/-/basicprimitives-6.0.3.tgz#8cd72565aa2c4f05acc216a48d0d571bf975b9d4"
+  integrity sha512-q7jiMXQvgUv++t0YDCUEWjIF+rjVaJhfwdlZaXoUMVtb/pfaf0BrbpLgjTsVQPkMNW+p2+y+joHCgBpD6SMEQA==
 
 bcryptjs@^2.3.0:
   version "2.4.3"
@@ -639,7 +624,7 @@ engine.io@~3.4.0:
     engine.io-parser "~2.2.0"
     ws "^7.1.2"
 
-entities@^1.1.1, entities@~1.1.1:
+entities@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
@@ -993,11 +978,6 @@ iterall@^1.2.2:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
   integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
 
-"js-tokens@^3.0.0 || ^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -1053,13 +1033,6 @@ lie@3.1.1:
   dependencies:
     immediate "~3.0.5"
 
-linkify-it@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
-  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
-  dependencies:
-    uc.micro "^1.0.1"
-
 localforage@^1.3.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz#f3e4d32a8300b362b4634cc4e066d9d00d2f09d1"
@@ -1132,38 +1105,6 @@ long-timeout@^0.1.1:
   resolved "https://registry.yarnpkg.com/long-timeout/-/long-timeout-0.1.1.tgz#9721d788b47e0bcb5a24c2e2bee1a0da55dab514"
   integrity sha1-lyHXiLR+C8taJMLivuGg2lXatRQ=
 
-loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-markdown-it@^8.4.2:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
-  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
-  dependencies:
-    argparse "^1.0.7"
-    entities "~1.1.1"
-    linkify-it "^2.0.0"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
-markdown-react-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/markdown-react-js/-/markdown-react-js-1.0.2.tgz#af9345e3316c97c375e405face6706a4c3093b0f"
-  integrity sha512-I3zAgIDsg9t4huj0yjyM8jAJtRg3EDoqRSeqE0Wg+WODLfmcxOkToQ0qcxkPCYlHqOX2CIQF78lZ5vcp4r3Qsw==
-  dependencies:
-    lodash "^4.17.10"
-    markdown-it "^8.4.2"
-    prop-types "^15.6.0"
-
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -1277,11 +1218,6 @@ oauth@0.9.x:
   resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
   integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE=
 
-object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
@@ -1439,15 +1375,6 @@ process@0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-prop-types@^15.6.0:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
 proxy-addr@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
@@ -1491,11 +1418,6 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-react-is@^16.8.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
 readable-stream@^3.1.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -1516,11 +1438,6 @@ renderkid@^2.0.4:
     lodash "^4.17.20"
     strip-ansi "^3.0.0"
 
-resize-observer-polyfill@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
-  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
 safe-buffer@5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -1647,11 +1564,6 @@ socket.io@^2.1.0:
     socket.io-client "2.3.0"
     socket.io-parser "~3.4.0"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -1715,11 +1627,6 @@ uberproto@^2.0.0, uberproto@^2.0.1, uberproto@^2.0.2:
   resolved "https://registry.yarnpkg.com/uberproto/-/uberproto-2.0.6.tgz#709274d183bce6fb734dfd3880d2086ed72b69e5"
   integrity sha512-68H97HffZoFaa3HFtpstahWorN9dSp5uTU6jo3GjIQ6JkJBR3hC2Nx/e/HFOoYHdUyT/Z1MRWfxN1EiQJZUyCQ==
 
-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
 uid-safe@~2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"