diff --git a/build/Gruntfile.js b/build/Gruntfile.js
index 17c4f3fc6b..db0afcbbce 100644
--- a/build/Gruntfile.js
+++ b/build/Gruntfile.js
@@ -93,7 +93,7 @@ module.exports = function(grunt) {
 		this.word = null;
 		this.cell = null;
 		this.slide = null;
-		this.draw = null;
+		this.visio = null;
 
 		this.append(pathConfigs);
 	}
@@ -133,10 +133,10 @@ module.exports = function(grunt) {
 		appendOption.call(this, 'word');
 		appendOption.call(this, 'cell');
 		appendOption.call(this, 'slide');
-		appendOption.call(this, 'draw');
+		appendOption.call(this, 'visio');
 	};
 	CConfig.prototype.valid = function () {
-		return this.externs && this.word && this.cell && this.slide && this.draw;
+		return this.externs && this.word && this.cell && this.slide && this.visio;
 	};
 
 	function getExterns(config) {
@@ -178,7 +178,7 @@ module.exports = function(grunt) {
 	const word = path.join(deploy, 'word');
 	const cell = path.join(deploy, 'cell');
 	const slide = path.join(deploy, 'slide');
-	const draw = path.join(deploy, 'draw');
+	const visio = path.join(deploy, 'visio');
 
 	const level = grunt.option('level') || 'ADVANCED';
 	const formatting = grunt.option('formatting') || '';
@@ -240,7 +240,7 @@ module.exports = function(grunt) {
 	const configWord = configs.word['sdk'];
 	const configCell = configs.cell['sdk'];
 	const configSlide = configs.slide['sdk'];
-	const configDraw = configs.draw['sdk'];
+	const configVisio = configs.visio['sdk'];
 
 	const compilerArgs = getExterns(configs.externs);
 	if (formatting) {
@@ -306,8 +306,8 @@ module.exports = function(grunt) {
 		grunt.initConfig(getCompileConfig(getFilesMin(configSlide), getFilesAll(configSlide), 'sdk-all-min', 'sdk-all', 'slide', path.join(slide , '/')));
 		grunt.task.run('closure-compiler');
 	});
-	grunt.registerTask('compile-draw', 'Compile Draw SDK', function () {
-		grunt.initConfig(getCompileConfig(getFilesMin(configDraw), getFilesAll(configDraw), 'sdk-all-min', 'sdk-all', 'draw', path.join(draw , '/')));
+	grunt.registerTask('compile-visio', 'Compile Visio SDK', function () {
+		grunt.initConfig(getCompileConfig(getFilesMin(configVisio), getFilesAll(configVisio), 'sdk-all-min', 'sdk-all', 'visio', path.join(visio , '/')));
 		grunt.task.run('closure-compiler');
 	});
 	grunt.registerTask('copy-maps', 'Copy maps from deploy to build', function() {
@@ -361,18 +361,18 @@ module.exports = function(grunt) {
 						}
 					]
 				},
-				draw: {
+				visio: {
 					files: [
 						{
 							expand: true,
-							cwd: draw,
+							cwd: visio,
 							src: [
 								'sdk-all-min.js.map',
 								'sdk-all.js.map',
 							],
 							dest: 'maps',
 							rename: function (dest, src) {
-								return path.join(dest , src.replace('sdk', 'draw'));
+								return path.join(dest , src.replace('sdk', 'visio'));
 							}
 						}
 					]
@@ -390,15 +390,15 @@ module.exports = function(grunt) {
 						path.join(cell, 'sdk-all.js.map'),
 						path.join(slide, 'sdk-all-min.js.map'),
 						path.join(slide, 'sdk-all.js.map'),
-						path.join(draw, 'sdk-all-min.js.map'),
-						path.join(draw, 'sdk-all.js.map'),
+						path.join(visio, 'sdk-all-min.js.map'),
+						path.join(visio, 'sdk-all.js.map'),
 					]
 				}
 			}
 		});
 		grunt.task.run('copy', 'clean');
 	});
-	grunt.registerTask('compile-sdk', ['compile-word', 'compile-cell', 'compile-slide', 'compile-draw']);
+	grunt.registerTask('compile-sdk', ['compile-word', 'compile-cell', 'compile-slide', 'compile-visio']);
 	grunt.registerTask('clean-deploy', 'Clean deploy folder before deploying', function () {
 		grunt.initConfig({
 			clean: {
@@ -517,7 +517,7 @@ module.exports = function(grunt) {
 		writeScripts(configs.word['sdk'], 'word');
 		writeScripts(configs.cell['sdk'], 'cell');
 		writeScripts(configs.slide['sdk'], 'slide');
-		writeScripts(configs.draw['sdk'], 'draw');
+		writeScripts(configs.visio['sdk'], 'visio');
 	});
 	const defaultTasks = ['clean-deploy', 'compile-sdk', 'copy-other'];
 	if (grunt.option('map')) {
diff --git a/common/editorscommon.js b/common/editorscommon.js
index 1f14df464b..e50e3b1522 100644
--- a/common/editorscommon.js
+++ b/common/editorscommon.js
@@ -2167,7 +2167,7 @@
 
 							if (data["subType"] === "connector")
 							{
-								window.g_asc_plugins.externalConnectorMessage(data["data"]);
+								window.g_asc_plugins.externalConnectorMessage(data["data"], event.origin);
 								return;
 							}
 
diff --git a/common/externs/global.js b/common/externs/global.js
index ad57859da8..0725c469f7 100644
--- a/common/externs/global.js
+++ b/common/externs/global.js
@@ -42,7 +42,7 @@ var AscCommon;
 var AscCommonWord;
 var AscCommonExcel;
 var AscCommonSlide;
-var AscCommonDraw;
+var AscVisio;
 var AscBuilder;
 var AscWord;
 var AscMath;
diff --git a/common/plugins.js b/common/plugins.js
index 832f316547..95feade3fc 100644
--- a/common/plugins.js
+++ b/common/plugins.js
@@ -1241,7 +1241,7 @@
 		},
 
 		// external
-		externalConnectorMessage : function(data)
+		externalConnectorMessage : function(data, origin)
 		{
 			switch (data["type"])
 			{
@@ -1251,7 +1251,7 @@
 					this.loadExtensionPlugins([{
 						"name" : "connector",
 						"guid" : data["guid"],
-						"baseUrl" : "",
+						"baseUrl" : (origin !== undefined) ? origin : "",
 						"isConnector" : true,
 
 						"variations" : [
diff --git a/configs/draw.json b/configs/visio.json
similarity index 97%
rename from configs/draw.json
rename to configs/visio.json
index 52000d88bc..6191455014 100644
--- a/configs/draw.json
+++ b/configs/visio.json
@@ -22,14 +22,14 @@
 			"common/AdvancedOptions.js",
 			"common/libfont/engine.js",
 			"common/libfont/loader.js",
-			"draw/apiDefines.js",
+			"visio/apiDefines.js",
 			"common/collaborativeHistory.js",
 			"common/CollaborativeEditingBase.js",
 			"common/macros.js",
 			"common/apiBase.js",
 			"common/apiBase_plugins.js",
 			"word/apiCommon.js",
-			"draw/api.js",
+			"visio/api.js",
 			"common/spell/spell.js",
 			"word/Editor/Table/TableLook.js",
 			"cell/utils/utils.js"
@@ -186,7 +186,7 @@
 			"slide/Drawing/MorphTransition.js",
 			"word/Drawing/cachemanager.js",
 			"slide/Drawing/DrawingDocument.js",
-			"draw/Drawing/HtmlPage.js",
+			"visio/Drawing/HtmlPage.js",
 			"word/Editor/StylesChanges.js",
 			"word/Editor/RevisionsChange.js",
 			"word/Editor/Paragraph/RunContent/Types.js",
@@ -324,9 +324,6 @@
 			"common/Drawings/Format/LockedCanvas.js",
 			"slide/apiCommon.js",
 
-			"word/apiBuilder.js",
-			"slide/apiBuilder.js",
-
 			"common/versionHistory.js",
 			"common/clipboard_base.js",
 			"common/text_input2.js",
@@ -339,12 +336,12 @@
 			
 			"vendor/easysax.js",
 			"common/openxml.js",
-			"draw/model/ooxmlApi/ooxmlApiIndex.js",
-			"draw/model/ooxmlApi/convertFunctions.js",
-			"draw/model/ooxmlApi/get-geometry-from-class.js",
-			"draw/model/visioFunctionsApi.js",
-			"draw/model/VisioDocument.js",
-			"draw/model/overrides.js",
+			"visio/model/ooxmlApi/ooxmlApiIndex.js",
+			"visio/model/ooxmlApi/convertFunctions.js",
+			"visio/model/ooxmlApi/get-geometry-from-class.js",
+			"visio/model/visioFunctionsApi.js",
+			"visio/model/VisioDocument.js",
+			"visio/model/overrides.js",
 
 			"slide/Editor/CollaborativeEditing.js"
 		],
diff --git a/tests/draw/api/api-test.html b/tests/visio/api/api-test.html
similarity index 89%
rename from tests/draw/api/api-test.html
rename to tests/visio/api/api-test.html
index 917d5961a9..83b72fe1fb 100644
--- a/tests/draw/api/api-test.html
+++ b/tests/visio/api/api-test.html
@@ -8,7 +8,7 @@
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>
 
-  <script type="text/javascript" src="../../../develop/sdkjs/draw/scripts.js"></script>
+  <script type="text/javascript" src="../../../develop/sdkjs/visio/scripts.js"></script>
   <script type="text/javascript">
 		window["WebAssembly"] = undefined
 		window.sdk_scripts.forEach(function(item){
diff --git a/tests/draw/api/api-test.js b/tests/visio/api/api-test.js
similarity index 99%
rename from tests/draw/api/api-test.js
rename to tests/visio/api/api-test.js
index 2d2cbd76fc..e03f0a1f80 100644
--- a/tests/draw/api/api-test.js
+++ b/tests/visio/api/api-test.js
@@ -31,7 +31,7 @@
  */
 
 $(function() {
-	var api = new Asc.asc_docs_api({
+	var api = new Asc.VisioEditorApi({
 		'id-view': 'editor_sdk'
 	});
 	AscCommon.g_oTableId.init();
@@ -46,7 +46,7 @@ $(function() {
 		// Read and parse vsdx file
 		const fileBase64 = emptyVsdxFileBase64;
 
-		const api = new Asc.asc_docs_api({'id-view': 'editor_sdk'});
+		const api = new Asc.VisioEditorApi({'id-view': 'editor_sdk'});
 		api.InitEditor();
 		let vsdxUint8Array = AscCommon.Base64.decode(fileBase64);
 		const openResOriginal = api.OpenDocumentFromZip(vsdxUint8Array);
@@ -67,7 +67,7 @@ $(function() {
 		let pages = doc.getPages();
 		if (pages.length) {
 			let firstPage = doc.getPageContents(0);
-			let shape = AscCommonDraw.createShape({
+			let shape = AscVisio.createShape({
 				width: 2,
 				height: 1,
 				fillForegroundColor: "#ffffff",
@@ -92,7 +92,7 @@ $(function() {
 			let firstPageShapes = firstPage.shapes;
 			if (firstPageShapes.length) {
 				let rectangle = firstPageShapes.find(function(shape) { return shape.name === "Rectangle"; });
-				let colorCell = new AscCommonDraw.Cell_Type();
+				let colorCell = new AscVisio.Cell_Type();
 				colorCell.n = "FillForegnd";
 				colorCell.v = colorHex;
 
diff --git a/tests/draw/api/api.js b/tests/visio/api/api.js
similarity index 90%
rename from tests/draw/api/api.js
rename to tests/visio/api/api.js
index 6158b36894..ba0ddd47bd 100644
--- a/tests/draw/api/api.js
+++ b/tests/visio/api/api.js
@@ -65,7 +65,7 @@
 	// }
 
 	function createCell(n, v, u, e, f) {
-		let cell = new AscCommonDraw.Cell_Type();
+		let cell = new AscVisio.Cell_Type();
 		cell.n = getValueSafe(n, null);
 		cell.v = getValueSafe(v, null);
 		cell.u = getValueSafe(u, null);
@@ -88,7 +88,7 @@
 
 		let pointsArray = getValueSafe(argumentsObject.points, []);
 
-		let shape = new AscCommonDraw.ShapeSheet_Type();
+		let shape = new AscVisio.ShapeSheet_Type();
 		shape.type = "Shape";
 		shape.lineStyle = 0;
 		shape.fillStyle = 0;
@@ -101,18 +101,18 @@
 		elements.push(createCell("Angle", angle));
 		elements.push(createCell("FillForegnd", fillForegroundColor));
 
-		let section = new AscCommonDraw.Section_Type();
+		let section = new AscVisio.Section_Type();
 		section.n = "Geometry";
 		section.iX = 0;
 
 		for (let i = 0; i < pointsArray.length; i++) {
 			let row;
 			if (i === 0) {
-				row = new AscCommonDraw.Row_Type();
+				row = new AscVisio.Row_Type();
 				row.t = "RelMoveTo";
 				row.iX = 1;
 			} else {
-				row = new AscCommonDraw.Row_Type();
+				row = new AscVisio.Row_Type();
 				row.t = "RelLineTo";
 				row.iX = i + 1;
 			}
@@ -124,22 +124,22 @@
 		return shape;
 	}
 
-	AscCommonDraw.CPageContents.prototype.addShape = function (shape, pinX, pinY) {
+	AscVisio.CPageContents.prototype.addShape = function (shape, pinX, pinY) {
 		shape.iD = this.shapes.length + 1;
 		shape.elements.push(createCell("PinX", pinX));
 		shape.elements.push(createCell("PinY", pinY));
 		this.shapes.push(shape);
 	}
 
-	AscCommonDraw.CVisioDocument.prototype.getPages = function () {
+	AscVisio.CVisioDocument.prototype.getPages = function () {
 		let pagesArray = this.pages.page;
 		return pagesArray;
 	}
 
-	AscCommonDraw.CVisioDocument.prototype.getPageContents = function (i) {
+	AscVisio.CVisioDocument.prototype.getPageContents = function (i) {
 		let pageContents = this.pageContents[i];
 		return pageContents;
 	}
 
-	window['AscCommonDraw'].createShape = createShape;
+	window['AscVisio'].createShape = createShape;
 })(window, window.document);
diff --git a/tests/draw/api/test-files.js b/tests/visio/api/test-files.js
similarity index 100%
rename from tests/draw/api/test-files.js
rename to tests/visio/api/test-files.js
diff --git a/tests/draw/draw-main/draw-main.html b/tests/visio/draw-main/draw-main.html
similarity index 95%
rename from tests/draw/draw-main/draw-main.html
rename to tests/visio/draw-main/draw-main.html
index 8cf44bbc69..dafd677d0c 100644
--- a/tests/draw/draw-main/draw-main.html
+++ b/tests/visio/draw-main/draw-main.html
@@ -51,7 +51,7 @@
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>
 
-<script type="text/javascript" src="../../../develop/sdkjs/draw/scripts.js"></script>
+<script type="text/javascript" src="../../../develop/sdkjs/visio/scripts.js"></script>
 <script>
   window.sdk_scripts.forEach(function(item){
     document.write('<script type="text/javascript" src="' + item + '"><\/script>');
diff --git a/tests/draw/draw-main/draw-main.js b/tests/visio/draw-main/draw-main.js
similarity index 99%
rename from tests/draw/draw-main/draw-main.js
rename to tests/visio/draw-main/draw-main.js
index ed79bb124d..b67c7d19f0 100644
--- a/tests/draw/draw-main/draw-main.js
+++ b/tests/visio/draw-main/draw-main.js
@@ -31,7 +31,7 @@
  */
 +function ($) {
     "use strict";
-    let api = new Asc.asc_docs_api({'id-view'  : 'editor_sdk'});
+    let api = new Asc.VisioEditorApi({'id-view'  : 'editor_sdk'});
 
     var holder = document.getElementById("editor_sdk");
     holder.ondragover = holderOnDradOver;
diff --git a/tests/draw/drawFile/draw-file.html b/tests/visio/drawFile/draw-file.html
similarity index 98%
rename from tests/draw/drawFile/draw-file.html
rename to tests/visio/drawFile/draw-file.html
index a71addf276..b88de44c1b 100644
--- a/tests/draw/drawFile/draw-file.html
+++ b/tests/visio/drawFile/draw-file.html
@@ -49,7 +49,7 @@
        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>
 
-       <script type="text/javascript" src="../../../develop/sdkjs/draw/scripts.js"></script>
+       <script type="text/javascript" src="../../../develop/sdkjs/visio/scripts.js"></script>
        <script>
           window.sdk_scripts.forEach(function(item){
               document.write('<script type="text/javascript" src="' + item + '"><\/script>');
diff --git a/tests/draw/drawFile/draw-file.js b/tests/visio/drawFile/draw-file.js
similarity index 98%
rename from tests/draw/drawFile/draw-file.js
rename to tests/visio/drawFile/draw-file.js
index 7dfe91bb3d..0f56c942fd 100644
--- a/tests/draw/drawFile/draw-file.js
+++ b/tests/visio/drawFile/draw-file.js
@@ -31,7 +31,7 @@
  */
 +function ($) {
 	"use strict";
-	let api = new Asc.asc_docs_api({'id-view'  : 'editor_sdk'});
+	let api = new Asc.VisioEditorApi({'id-view'  : 'editor_sdk'});
 
 	var holder = document.getElementById("editor_sdk");
 	holder.ondragover = holderOnDradOver;
diff --git a/tests/draw/serialize/sax-serialize-files-many.js b/tests/visio/serialize/sax-serialize-files-many.js
similarity index 100%
rename from tests/draw/serialize/sax-serialize-files-many.js
rename to tests/visio/serialize/sax-serialize-files-many.js
diff --git a/tests/draw/serialize/sax-serialize-files.js b/tests/visio/serialize/sax-serialize-files.js
similarity index 100%
rename from tests/draw/serialize/sax-serialize-files.js
rename to tests/visio/serialize/sax-serialize-files.js
diff --git a/tests/draw/serialize/sax-serialize.html b/tests/visio/serialize/sax-serialize.html
similarity index 94%
rename from tests/draw/serialize/sax-serialize.html
rename to tests/visio/serialize/sax-serialize.html
index bf2ca11193..da451e8afa 100644
--- a/tests/draw/serialize/sax-serialize.html
+++ b/tests/visio/serialize/sax-serialize.html
@@ -10,7 +10,7 @@
 		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/qunit/2.16.0/qunit.min.js"></script>
 		<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>
 
-		<script type="text/javascript" src="../../../develop/sdkjs/draw/scripts.js"></script>
+		<script type="text/javascript" src="../../../develop/sdkjs/visio/scripts.js"></script>
 		<script type="text/javascript">
 			window["WebAssembly"] = undefined
 			window.sdk_scripts.forEach(function(item){
diff --git a/tests/draw/serialize/sax-serialize.js b/tests/visio/serialize/sax-serialize.js
similarity index 98%
rename from tests/draw/serialize/sax-serialize.js
rename to tests/visio/serialize/sax-serialize.js
index ae1252eb1e..b932548c3e 100644
--- a/tests/draw/serialize/sax-serialize.js
+++ b/tests/visio/serialize/sax-serialize.js
@@ -33,7 +33,7 @@
 //for zlib async loading
 QUnit.config.autostart = false;
 $(function() {
-	const api = new Asc.asc_docs_api({
+	const api = new Asc.VisioEditorApi({
 		'id-view': 'editor_sdk'
 	});
 	AscCommon.g_oTableId.init();
@@ -61,7 +61,7 @@ $(function() {
 
 		QUnit.test("Test api.OpenDocumentFromZip", function (assert)
 		{
-			const api = new Asc.asc_docs_api({'id-view': 'editor_sdk'});
+			const api = new Asc.VisioEditorApi({'id-view': 'editor_sdk'});
 			api.InitEditor();
 			// get Uint8Array
 			let vsdx = AscCommon.Base64.decode(Asc.exampleVsdx);
@@ -72,7 +72,7 @@ $(function() {
 		QUnit.test("Check api.saveDocumentToZip", function (assert)
 		{
 			// Read and parse vsdx file
-			const api = new Asc.asc_docs_api({'id-view': 'editor_sdk'});
+			const api = new Asc.VisioEditorApi({'id-view': 'editor_sdk'});
 			api.InitEditor();
 			let vsdx = AscCommon.Base64.decode(Asc.exampleVsdx);
 			const openRes = api.OpenDocumentFromZip(vsdx);
@@ -88,7 +88,7 @@ $(function() {
 		QUnit.test("Compare files count", function (assert)
 		{
 			// Read and parse vsdx file
-			const api = new Asc.asc_docs_api({'id-view': 'editor_sdk'});
+			const api = new Asc.VisioEditorApi({'id-view': 'editor_sdk'});
 			api.InitEditor();
 			let vsdx = AscCommon.Base64.decode(Asc.exampleVsdx);
 			const openRes = api.OpenDocumentFromZip(vsdx);
@@ -97,7 +97,7 @@ $(function() {
 			api.saveDocumentToZip(api.Document, AscCommon.c_oEditorId.Draw, function (data) {
 				if (data) {
 					// Read and parse vsdx file
-					const api2 = new Asc.asc_docs_api({'id-view': 'editor_sdk'});
+					const api2 = new Asc.VisioEditorApi({'id-view': 'editor_sdk'});
 					api2.InitEditor();
 
 					let jsZlib = new AscCommon.ZLib();
@@ -218,7 +218,7 @@ $(function() {
 					let rootTagName = rootTagNameMatchResult[2];
 					let rootTagNameCapitalized = rootTagName.charAt(0).toUpperCase() + rootTagName.slice(1);
 					let componentClassName = "C" + rootTagNameCapitalized;
-					let componentClass = AscCommonDraw[componentClassName];
+					let componentClass = AscVisio[componentClassName];
 					if (componentClass) {
 						let componentObject = new componentClass(api);
 						QUnit.test(testName, function (assert) {
@@ -250,7 +250,7 @@ $(function() {
 		testFunction('File ' + fileName, function (assert)
 		{
 			// Read and parse vsdx file
-			const api = new Asc.asc_docs_api({'id-view': 'editor_sdk'});
+			const api = new Asc.VisioEditorApi({'id-view': 'editor_sdk'});
 			api.InitEditor();
 			let vsdxOriginal = AscCommon.Base64.decode(base64);
 			// parse
@@ -269,7 +269,7 @@ $(function() {
 
 					// Read and parse custom vsdx file
 					// TODO try to parse again custom file
-					// const api2 = new Asc.asc_docs_api({'id-view': 'editor_sdk'});
+					// const api2 = new Asc.VisioEditorApi({'id-view': 'editor_sdk'});
 					// api2.InitEditor();
 					// const openResCustom = api2.OpenDocumentFromZip(data);
 
diff --git a/draw/Drawing/HtmlPage.js b/visio/Drawing/HtmlPage.js
similarity index 99%
rename from draw/Drawing/HtmlPage.js
rename to visio/Drawing/HtmlPage.js
index 3b8b31cfc5..d4e41dec8a 100644
--- a/draw/Drawing/HtmlPage.js
+++ b/visio/Drawing/HtmlPage.js
@@ -3627,8 +3627,8 @@ function CEditorPage(api)
 }
 //------------------------------------------------------------export----------------------------------------------------
 window['AscCommon']                       = window['AscCommon'] || {};
-window['AscCommonDraw']                  = window['AscCommonDraw'] || {};
-window['AscCommonDraw'].CEditorPage      = CEditorPage;
+window['AscVisio']                  = window['AscVisio'] || {};
+window['AscVisio'].CEditorPage      = CEditorPage;
 
 window['AscCommon'].Page_Width      = Page_Width;
 window['AscCommon'].Page_Height     = Page_Height;
diff --git a/draw/api.js b/visio/api.js
similarity index 87%
rename from draw/api.js
rename to visio/api.js
index 91c69be3be..4e35178688 100644
--- a/draw/api.js
+++ b/visio/api.js
@@ -46,7 +46,7 @@
 	 * @constructor
 	 * @extends {AscCommon.baseEditorsApi}
 	 */
-	function asc_docs_api(config)
+	function VisioEditorApi(config)
 	{
 		AscCommon.baseEditorsApi.call(this, config, AscCommon.c_oEditorId.Draw);
 
@@ -89,16 +89,16 @@
 		return this;
 	}
 
-	asc_docs_api.prototype = Object.create(AscCommon.baseEditorsApi.prototype);
-	asc_docs_api.prototype.constructor = asc_docs_api;
+	VisioEditorApi.prototype = Object.create(AscCommon.baseEditorsApi.prototype);
+	VisioEditorApi.prototype.constructor = VisioEditorApi;
 
-	asc_docs_api.prototype.InitEditor = function(){
-		this.Document = new AscCommonDraw.CVisioDocument(this, this.WordControl.m_oDrawingDocument);
+	VisioEditorApi.prototype.InitEditor = function(){
+		this.Document = new AscVisio.CVisioDocument(this, this.WordControl.m_oDrawingDocument);
 
 		this.WordControl.m_oLogicDocument = this.Document;
 		this.WordControl.m_oDrawingDocument.m_oLogicDocument = this.WordControl.m_oLogicDocument;
 	};
-	asc_docs_api.prototype._onEndLoadSdk  = function()
+	VisioEditorApi.prototype._onEndLoadSdk  = function()
 	{
 		AscCommon.baseEditorsApi.prototype._onEndLoadSdk.call(this);
 
@@ -111,7 +111,7 @@
 
 		this._loadSdkImages();
 
-		this.WordControl      = new AscCommonDraw.CEditorPage(this);
+		this.WordControl      = new AscVisio.CEditorPage(this);
 		this.WordControl.Name = this.HtmlElementName;
 		this.CreateComponents();
 		this.WordControl.Init();
@@ -153,7 +153,7 @@
 
 		this.asc_setViewMode(this.isViewMode);
 	};
-	asc_docs_api.prototype.CreateCSS = function()
+	VisioEditorApi.prototype.CreateCSS = function()
 	{
 		var _head = document.getElementsByTagName('head')[0];
 
@@ -162,7 +162,7 @@
 		style0.innerHTML = ".block_elem { position:absolute;padding:0;margin:0; }";
 		_head.appendChild(style0);
 	};
-	asc_docs_api.prototype.CreateComponents = function()
+	VisioEditorApi.prototype.CreateComponents = function()
 	{
 		this.asc_setSkin(this.skinObject);
 		delete this.skinObject;
@@ -217,7 +217,7 @@
 		this.canvas = document.getElementById("id_viewer");
 	};
 	// работа с шрифтами
-	asc_docs_api.prototype.asyncFontsDocumentStartLoaded = function(blockType)
+	VisioEditorApi.prototype.asyncFontsDocumentStartLoaded = function(blockType)
 	{
 		this.sync_StartAction(undefined === blockType ? Asc.c_oAscAsyncActionType.BlockInteraction : blockType, Asc.c_oAscAsyncAction.LoadDocumentFonts);
 		var _progress         = this.OpenDocumentProgress;
@@ -243,7 +243,7 @@
 		_progress.ImagesCount  = _count;
 		_progress.CurrentImage = 0;
 	};
-	asc_docs_api.prototype.asyncFontsDocumentEndLoaded   = function(blockType) {
+	VisioEditorApi.prototype.asyncFontsDocumentEndLoaded   = function(blockType) {
 		this.sync_EndAction(undefined === blockType ? Asc.c_oAscAsyncActionType.BlockInteraction : blockType, Asc.c_oAscAsyncAction.LoadDocumentFonts);
 
 		this.EndActionLoadImages = 0;
@@ -273,7 +273,7 @@
 		this.ImageLoader.bIsLoadDocumentFirst = true;
 		this.ImageLoader.LoadDocumentImages(_loader_object.ImageMap);
 	};
-	asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function()
+	VisioEditorApi.prototype.asyncImagesDocumentEndLoaded = function()
 	{
 		this.ImageLoader.bIsLoadDocumentFirst = false;
 
@@ -287,7 +287,7 @@
 		this.ServerImagesWaitComplete = true;
 		this._openDocumentEndCallback();
 	};
-	asc_docs_api.prototype._openDocumentEndCallback = function()
+	VisioEditorApi.prototype._openDocumentEndCallback = function()
 	{
 		if (this.isDocumentLoadComplete || !this.ServerImagesWaitComplete || !this.ServerIdWaitComplete || !this.WordControl || !this.WordControl.m_oLogicDocument)
 			return;
@@ -315,7 +315,7 @@
 		this.WordControl.GoToPage(this.Document.getCurrentPage());
 	};
 
-	asc_docs_api.prototype.OpenDocumentFromZip = function(data)
+	VisioEditorApi.prototype.OpenDocumentFromZip = function(data)
 	{
 		this.DocumentType = 2;
 
@@ -339,7 +339,7 @@
 			setInterval(AscCommon.SafariIntervalFocus, 10);
 		return res;
 	};
-	asc_docs_api.prototype.OpenDocumentFromZipNoInit = function(data)
+	VisioEditorApi.prototype.OpenDocumentFromZipNoInit = function(data)
 	{
 		if (!data) {
 			return false;
@@ -363,7 +363,7 @@
 		jsZlib.close();
 		return true;
 	};
-	asc_docs_api.prototype.asc_CloseFile            = function()
+	VisioEditorApi.prototype.asc_CloseFile            = function()
 	{
 		AscCommon.History.Clear();
 		AscCommon.g_oTableId.Clear();
@@ -373,16 +373,16 @@
 		this.turnOffSpecialModes();
 		AscCommon.pptx_content_loader.ImageMapChecker = {};
 	};
-	asc_docs_api.prototype.asc_getAppProps = function()
+	VisioEditorApi.prototype.asc_getAppProps = function()
 	{
 		return this.WordControl && this.WordControl.m_oLogicDocument && this.WordControl.m_oLogicDocument.app || null;
 	};
-	asc_docs_api.prototype.getInternalCoreProps = function()
+	VisioEditorApi.prototype.getInternalCoreProps = function()
 	{
 		return this.WordControl && this.WordControl.m_oLogicDocument && this.WordControl.m_oLogicDocument.core;
 	};
-	window["asc_docs_api"]                                 = asc_docs_api;
-	window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, version)
+	window["VisioEditorApi"]                                 = VisioEditorApi;
+	window["VisioEditorApi"].prototype["asc_nativeOpenFile"] = function(base64File, version)
 	{
 		// this.SpellCheckUrl = '';
 		//
@@ -407,32 +407,32 @@
 		AscCommon.g_oIdCounter.Set_Load(false);
 	};
 
-	window["asc_docs_api"].prototype["asc_nativeCalculateFile"] = function()
+	window["VisioEditorApi"].prototype["asc_nativeCalculateFile"] = function()
 	{
 		//todo
 	};
 
-	window["asc_docs_api"].prototype["asc_nativeApplyChanges"] = function(changes)
+	window["VisioEditorApi"].prototype["asc_nativeApplyChanges"] = function(changes)
 	{
 		//todo
 	};
 
-	window["asc_docs_api"].prototype["asc_nativeApplyChanges2"] = function(data, isFull)
+	window["VisioEditorApi"].prototype["asc_nativeApplyChanges2"] = function(data, isFull)
 	{
 		//todo
 	};
 
-	window["asc_docs_api"].prototype["asc_nativeGetFile"] = function()
+	window["VisioEditorApi"].prototype["asc_nativeGetFile"] = function()
 	{
 		//todo
 	};
 
-	window["asc_docs_api"].prototype.asc_nativeGetFile3 = function()
+	window["VisioEditorApi"].prototype.asc_nativeGetFile3 = function()
 	{
 		//todo
 	};
 
-	window["asc_docs_api"].prototype["asc_nativeGetFileData"] = function()
+	window["VisioEditorApi"].prototype["asc_nativeGetFileData"] = function()
 	{
 		if (this.isOpenOOXInBrowser && this.saveDocumentToZip) {
 			let res;
@@ -447,11 +447,11 @@
 		}
 	};
 
-	window["asc_docs_api"].prototype["asc_nativeCalculate"] = function()
+	window["VisioEditorApi"].prototype["asc_nativeCalculate"] = function()
 	{
 	};
 
-	window["asc_docs_api"].prototype["asc_nativePrint"] = function(_printer, _page, _options)
+	window["VisioEditorApi"].prototype["asc_nativePrint"] = function(_printer, _page, _options)
 	{
 		if (undefined === _printer && _page === undefined)
 		{
@@ -514,12 +514,12 @@
 		_printer.EndPage();
 	};
 
-	window["asc_docs_api"].prototype["asc_nativePrintPagesCount"] = function()
+	window["VisioEditorApi"].prototype["asc_nativePrintPagesCount"] = function()
 	{
 		return this.WordControl.GetSlidesCount();
 	};
 
-	window["asc_docs_api"].prototype["asc_nativeGetPDF"] = function(options)
+	window["VisioEditorApi"].prototype["asc_nativeGetPDF"] = function(options)
 	{
 		if (options && options["watermark"])
 		{
@@ -559,7 +559,7 @@
 
 		return _renderer.Memory.data;
 	};
-	asc_docs_api.prototype.openDocument = function(file)
+	VisioEditorApi.prototype.openDocument = function(file)
 	{
 		let perfStart = performance.now();
 		// if (file.changes && this.VersionHistory)
@@ -577,7 +577,7 @@
 		let perfEnd = performance.now();
 		AscCommon.sendClientLog("debug", AscCommon.getClientInfoString("onOpenDocument", perfEnd - perfStart), this);
 	};
-	asc_docs_api.prototype.isDocumentModified = function()
+	VisioEditorApi.prototype.isDocumentModified = function()
 	{
 		return false;
 		if (!this.canSave)
@@ -587,7 +587,7 @@
 		}
 		return this.isDocumentModify;
 	};
-	asc_docs_api.prototype.SetDrawingFreeze = function(bIsFreeze)
+	VisioEditorApi.prototype.SetDrawingFreeze = function(bIsFreeze)
 	{
 		if (!this.isLoadFullApi)
 		{
@@ -613,21 +613,21 @@
 		if (!bIsFreeze)
 			this.WordControl.OnScroll();
 	};
-	asc_docs_api.prototype.asc_setSpellCheck = function(isOn)
+	VisioEditorApi.prototype.asc_setSpellCheck = function(isOn)
 	{
 	};
-	asc_docs_api.prototype.asc_setSpellCheckSettings = function(oSettings)
+	VisioEditorApi.prototype.asc_setSpellCheckSettings = function(oSettings)
 	{
 	};
-	asc_docs_api.prototype.zoomIn         = function()
+	VisioEditorApi.prototype.zoomIn         = function()
 	{
 		this.WordControl.zoom_In();
 	};
-	asc_docs_api.prototype.zoomOut        = function()
+	VisioEditorApi.prototype.zoomOut        = function()
 	{
 		this.WordControl.zoom_Out();
 	};
-	asc_docs_api.prototype.zoomFitToPage  = function()
+	VisioEditorApi.prototype.zoomFitToPage  = function()
 	{
 		if (!this.isLoadFullApi)
 		{
@@ -636,7 +636,7 @@
 		}
 		this.WordControl.zoom_FitToPage();
 	};
-	asc_docs_api.prototype.zoomFitToWidth = function()
+	VisioEditorApi.prototype.zoomFitToWidth = function()
 	{
 		if (!this.isLoadFullApi)
 		{
@@ -645,7 +645,7 @@
 		}
 		this.WordControl.zoom_FitToWidth();
 	};
-	asc_docs_api.prototype.zoomCustomMode = function()
+	VisioEditorApi.prototype.zoomCustomMode = function()
 	{
 		if (!this.isLoadFullApi)
 		{
@@ -655,21 +655,21 @@
 		this.WordControl.m_nZoomType = 0;
 		this.WordControl.zoom_Fire();
 	};
-	asc_docs_api.prototype.zoom100        = function()
+	VisioEditorApi.prototype.zoom100        = function()
 	{
 		this.WordControl.m_nZoomValue = 100;
 		this.WordControl.zoom_Fire();
 	};
-	asc_docs_api.prototype.zoom           = function(percent)
+	VisioEditorApi.prototype.zoom           = function(percent)
 	{
 		this.WordControl.m_nZoomValue = percent;
 		this.WordControl.zoom_Fire(0);
 	};
-	asc_docs_api.prototype.goToPage       = function(number)
+	VisioEditorApi.prototype.goToPage       = function(number)
 	{
 		this.WordControl.GoToPage(number);
 	};
-	asc_docs_api.prototype.SetFontRenderingMode         = function(mode)
+	VisioEditorApi.prototype.SetFontRenderingMode         = function(mode)
 	{
 		if (!this.isLoadFullApi)
 		{
@@ -692,20 +692,20 @@
 		// if (this.bInit_word_control)
 		// 	this.WordControl.OnScroll();
 	}
-	asc_docs_api.prototype.asc_setLocale = function(val)
+	VisioEditorApi.prototype.asc_setLocale = function(val)
 	{
 		this.locale = val;
 	};
-	asc_docs_api.prototype.asc_getLocale = function()
+	VisioEditorApi.prototype.asc_getLocale = function()
 	{
 		return this.locale;
 	};
-	asc_docs_api.prototype.asc_SetDocumentUnits = function(_units)
+	VisioEditorApi.prototype.asc_SetDocumentUnits = function(_units)
 	{
 		//todo
 		this.tmpDocumentUnits = _units;
 	};
-	asc_docs_api.prototype.updateSkin = function()
+	VisioEditorApi.prototype.updateSkin = function()
 	{
 		var baseElem = document.getElementById(this.HtmlElementName);
 		if (baseElem)
@@ -726,12 +726,12 @@
 		if (this.WordControl && this.WordControl.m_oBody)
 			this.WordControl.OnResize(true);
 	};
-	asc_docs_api.prototype.Resize = function() {
+	VisioEditorApi.prototype.Resize = function() {
 		if (false === this.bInit_word_control)
 			return;
 		this.WordControl.OnResize(false);
 	};
-	asc_docs_api.prototype.sendEvent = function()
+	VisioEditorApi.prototype.sendEvent = function()
 	{
 		this.sendInternalEvent.apply(this, arguments);
 		var name = arguments[0];
@@ -746,13 +746,13 @@
 		return false;
 	};
 	var _callbacks = {};
-	asc_docs_api.prototype.asc_registerCallback = function(name, callback)
+	VisioEditorApi.prototype.asc_registerCallback = function(name, callback)
 	{
 		if (!_callbacks.hasOwnProperty(name))
 			_callbacks[name] = [];
 		_callbacks[name].push(callback);
 	};
-	asc_docs_api.prototype.asc_unregisterCallback = function(name, callback)
+	VisioEditorApi.prototype.asc_unregisterCallback = function(name, callback)
 	{
 		if (_callbacks.hasOwnProperty(name))
 		{
@@ -763,7 +763,7 @@
 			}
 		}
 	};
-	asc_docs_api.prototype.asc_checkNeedCallback = function(name)
+	VisioEditorApi.prototype.asc_checkNeedCallback = function(name)
 	{
 		if (_callbacks.hasOwnProperty(name))
 		{
@@ -771,18 +771,18 @@
 		}
 		return false;
 	};
-	asc_docs_api.prototype.asc_SetFastCollaborative = function(isOn)
+	VisioEditorApi.prototype.asc_SetFastCollaborative = function(isOn)
 	{
 	};
-	asc_docs_api.prototype.getCountPages  = function()
+	VisioEditorApi.prototype.getCountPages  = function()
 	{
 		return this.WordControl && this.WordControl.m_oLogicDocument && this.WordControl.m_oLogicDocument.getCountPages() || 0
 	};
-	asc_docs_api.prototype.GetCurrentVisiblePage  = function()
+	VisioEditorApi.prototype.GetCurrentVisiblePage  = function()
 	{
 		return this.WordControl.m_oDrawingDocument.SlideCurrent;
 	};
-	asc_docs_api.prototype.ShowThumbnails           = function(bIsShow)
+	VisioEditorApi.prototype.ShowThumbnails           = function(bIsShow)
 	{
 		if (bIsShow)
 		{
@@ -799,24 +799,24 @@
 			this.WordControl.OldSplitter1Pos = old;
 		}
 	}
-	asc_docs_api.prototype["asc_setViewerTargetType"] = asc_docs_api.prototype.asc_setViewerTargetType = function(type) {
+	VisioEditorApi.prototype["asc_setViewerTargetType"] = VisioEditorApi.prototype.asc_setViewerTargetType = function(type) {
 		this.isHandMode = ("hand" === type);
 		// this.WordControl.checkMouseHandMode();
 		// this.WordControl.onMouseMove();
 		this.sendEvent("asc_onChangeViewerTargetType", this.isHandMode);
 	};
-	asc_docs_api.prototype.getLogicDocument = asc_docs_api.prototype.private_GetLogicDocument = function() {
+	VisioEditorApi.prototype.getLogicDocument = VisioEditorApi.prototype.private_GetLogicDocument = function() {
 		return this.WordControl && this.WordControl.m_oLogicDocument || null;
 	};
 
-	asc_docs_api.prototype.asc_DownloadAs = function(options)
+	VisioEditorApi.prototype.asc_DownloadAs = function(options)
 	{
 		if (this.isLongAction()) {
 			return;
 		}
 		this.downloadAs(Asc.c_oAscAsyncAction.DownloadAs, options);
 	};
-	asc_docs_api.prototype._downloadAs = function(actionType, options, oAdditionalData, dataContainer, downloadType)
+	VisioEditorApi.prototype._downloadAs = function(actionType, options, oAdditionalData, dataContainer, downloadType)
 	{
 		var t = this;
 		var fileType = options.fileType;
@@ -871,7 +871,7 @@
 			return true;
 		}
 	};
-	asc_docs_api.prototype.asc_getPageName = function(index)
+	VisioEditorApi.prototype.asc_getPageName = function(index)
 	{
 		if (this.Document && this.Document.pages && index < this.Document.pages.page.length) {
 			return this.Document.pages.page[index].name;
@@ -879,23 +879,23 @@
 		return "";
 	};
 	/*callbacks*/
-	asc_docs_api.prototype.sync_zoomChangeCallback  = function(percent, type)
+	VisioEditorApi.prototype.sync_zoomChangeCallback  = function(percent, type)
 	{	//c_oAscZoomType.Current, c_oAscZoomType.FitWidth, c_oAscZoomType.FitPage
 		this.sendEvent("asc_onZoomChange", percent, type);
 	};
-	asc_docs_api.prototype.sync_countPagesCallback  = function(count)
+	VisioEditorApi.prototype.sync_countPagesCallback  = function(count)
 	{
 		this.sendEvent("asc_onCountPages", count);
 	};
-	asc_docs_api.prototype.sync_currentPageCallback = function(number)
+	VisioEditorApi.prototype.sync_currentPageCallback = function(number)
 	{
 		this.sendEvent("asc_onCurrentPage", number);
 	};
-	asc_docs_api.prototype.sync_ContextMenuCallback = function(Data)
+	VisioEditorApi.prototype.sync_ContextMenuCallback = function(Data)
 	{
 		this.sendEvent("asc_onContextMenu", Data);
 	};
-	asc_docs_api.prototype.sync_EndAddShape = function()
+	VisioEditorApi.prototype.sync_EndAddShape = function()
 	{
 		editor.sendEvent("asc_onEndAddShape");
 		if (this.WordControl.m_oDrawingDocument.m_sLockedCursorType == "crosshair")
@@ -906,7 +906,7 @@
 			this.WordControl.m_oLogicDocument.TurnOn_InterfaceEvents(false);
 		}
 	};
-	asc_docs_api.prototype.syncOnThumbnailsShow = function()
+	VisioEditorApi.prototype.syncOnThumbnailsShow = function()
 	{
 		var bIsShow = true;
 		if (0 == this.WordControl.Splitter1Pos)
@@ -914,7 +914,7 @@
 
 		this.sendEvent("asc_onThumbnailsShow", bIsShow);
 	};
-	asc_docs_api.prototype.OnMouseUp = function(x, y)
+	VisioEditorApi.prototype.OnMouseUp = function(x, y)
 	{
 		var _e = AscCommon.CreateMouseUpEventObject(x, y);
 		AscCommon.Window_OnMouseUp(_e);
@@ -922,14 +922,14 @@
 		//this.WordControl.onMouseUpExternal(x, y);
 	};
 	//temp stubs
-	asc_docs_api.prototype.getCountSlides = function()
+	VisioEditorApi.prototype.getCountSlides = function()
 	{
 		return this.Document.getCountPages();
 	};
 	//-------------------------------------------------------------export---------------------------------------------------
 	window['Asc']                                                       = window['Asc'] || {};
-	window['Asc']['asc_docs_api']                                       = asc_docs_api;
-	let prot															= asc_docs_api.prototype;
+	window['Asc']['VisioEditorApi']                                       = VisioEditorApi;
+	let prot															= VisioEditorApi.prototype;
 	//todo apiBase
 	prot['asc_GetFontThumbnailsPath']				= prot.asc_GetFontThumbnailsPath;
 	prot["asc_coAuthoringDisconnect"]				= prot.asc_coAuthoringDisconnect;
diff --git a/draw/apiDefines.js b/visio/apiDefines.js
similarity index 100%
rename from draw/apiDefines.js
rename to visio/apiDefines.js
diff --git a/draw/model/VisioDocument.js b/visio/model/VisioDocument.js
similarity index 98%
rename from draw/model/VisioDocument.js
rename to visio/model/VisioDocument.js
index f2debd1ca5..d9766a232c 100644
--- a/draw/model/VisioDocument.js
+++ b/visio/model/VisioDocument.js
@@ -157,7 +157,7 @@
 			reader = new StaxParser(contentDocument, documentPart, context);
 			this.fromXml(reader);
 			// TODO mb consider 'this' contains parts(.xml files) only but not XML like document.xml and windows.xml
-			// this.visioDocument_Type = new AscCommonDraw.VisioDocument_Type();
+			// this.visioDocument_Type = new AscVisio.VisioDocument_Type();
 			// this.visioDocument_Type.fromXml(reader);
 
 			parseWindows.call(this, documentPart, reader, context);
@@ -1264,22 +1264,22 @@
 	window['AscCommonWord']  = window['AscCommonWord'] || {};
 	window['AscCommonSlide'] = window['AscCommonSlide'] || {};
 	window['AscCommonExcel'] = window['AscCommonExcel'] || {};
-	window['AscCommonDraw']  = window['AscCommonDraw'] || {};
+	window['AscVisio']  = window['AscVisio'] || {};
 	window['AscFormat']  = window['AscFormat'] || {};
 	window['AscWord'] = window['AscWord'] || {};
 
-	window['AscCommonDraw'].CVisioDocument = CVisioDocument;
-	window['AscCommonDraw'].CWindows = CWindows;
-	window['AscCommonDraw'].CMasters = CMasters;
-	window['AscCommonDraw'].CMasterContents = CMasterContents;
-	window['AscCommonDraw'].CPages = CPages;
-	window['AscCommonDraw'].CPageContents = CPageContents;
-	window['AscCommonDraw'].CComments = CComments;
-	window['AscCommonDraw'].CExtensions = CExtensions;
-	window['AscCommonDraw'].CDataConnections = CDataConnections;
-	window['AscCommonDraw'].CDataRecordSets = CDataRecordSets;
-	window['AscCommonDraw'].CValidation = CValidation;
+	window['AscVisio'].CVisioDocument = CVisioDocument;
+	window['AscVisio'].CWindows = CWindows;
+	window['AscVisio'].CMasters = CMasters;
+	window['AscVisio'].CMasterContents = CMasterContents;
+	window['AscVisio'].CPages = CPages;
+	window['AscVisio'].CPageContents = CPageContents;
+	window['AscVisio'].CComments = CComments;
+	window['AscVisio'].CExtensions = CExtensions;
+	window['AscVisio'].CDataConnections = CDataConnections;
+	window['AscVisio'].CDataRecordSets = CDataRecordSets;
+	window['AscVisio'].CValidation = CValidation;
 	// Not realized, file defines schema and data of that schema
-	window['AscCommonDraw'].CSolutions = CSolutions;
-	window['AscCommonDraw'].CSolutionXML = CSolutionXML;
+	window['AscVisio'].CSolutions = CSolutions;
+	window['AscVisio'].CSolutionXML = CSolutionXML;
 })(window, window.document);
diff --git a/draw/model/ooxmlApi/convertFunctions.js b/visio/model/ooxmlApi/convertFunctions.js
similarity index 98%
rename from draw/model/ooxmlApi/convertFunctions.js
rename to visio/model/ooxmlApi/convertFunctions.js
index 6013f948bb..07639d1510 100644
--- a/draw/model/ooxmlApi/convertFunctions.js
+++ b/visio/model/ooxmlApi/convertFunctions.js
@@ -35,7 +35,7 @@
 (function(window, document)
 {
 	// Import
-	let Shape_Type = window['AscCommonDraw'].Shape_Type;
+	let Shape_Type = window['AscVisio'].Shape_Type;
 
 	function convertVsdxTextToPptxText(text){
 		// Replace LineSeparator
@@ -97,14 +97,14 @@
 									// evaluation = THEMEVAL("FillColor")
 									// get theme shape fill color despite cell
 									// line below will give unifill with pattern maybe or gradient
-									// lineUniFill = AscCommonDraw.themeval(this.theme, shape, null, "FillColor");
+									// lineUniFill = AscVisio.themeval(this.theme, shape, null, "FillColor");
 									lineColor.R = fillColor.R;
 									lineColor.G = fillColor.G;
 									lineColor.B = fillColor.B;
 								} else {
 									// evaluation = THEMEVAL("LineColor") or not affected I guess
 									// get theme line color despite cell
-									// lineUniFill = AscCommonDraw.themeval(this.theme, shape, null, "LineColor");
+									// lineUniFill = AscVisio.themeval(this.theme, shape, null, "LineColor");
 								}
 							}
 						}
@@ -124,7 +124,7 @@
 									// evaluation = THEMEVAL("FillColor")
 									// get theme shape fill color despite cell
 									// line below will give unifill with pattern maybe or gradient
-									// lineUniFill = AscCommonDraw.themeval(this.theme, shape, null, "FillColor");
+									// lineUniFill = AscVisio.themeval(this.theme, shape, null, "FillColor");
 									fillColor.R = lineColor.R;
 									fillColor.G = lineColor.G;
 									fillColor.B = lineColor.B;
@@ -285,7 +285,7 @@
 				let hAlignCell = paragraphPropsFinal && paragraphPropsFinal.getCell("HorzAlign");
 
 				let horizontalAlign = AscCommon.align_Left;
-				if (hAlignCell && hAlignCell.kind === AscCommonDraw.c_oVsdxSheetStorageKind.Cell_Type) {
+				if (hAlignCell && hAlignCell.kind === AscVisio.c_oVsdxSheetStorageKind.Cell_Type) {
 					// omit calculateCellValue here
 					// let fontColor = calculateCellValue(theme, shape, characterColorCell);
 					let horAlignTryParse = Number(hAlignCell.v);
@@ -385,12 +385,12 @@
 				// handle Color
 				let characterColorCell = characterPropsFinal && characterPropsFinal.getCell("Color");
 				let fontColor;
-				if (characterColorCell && characterColorCell.kind === AscCommonDraw.c_oVsdxSheetStorageKind.Cell_Type) {
+				if (characterColorCell && characterColorCell.kind === AscVisio.c_oVsdxSheetStorageKind.Cell_Type) {
 					fontColor = characterColorCell.calculateValue(shape, pageInfo,
 						visioDocument.themes, themeValWasUsedFor);
 				} else {
 					AscCommon.consoleLog.log("text color cell not found! set text color as themed");
-					fontColor = AscCommonDraw.themeval(null, shape, pageInfo, visioDocument.themes, "TextColor");
+					fontColor = AscVisio.themeval(null, shape, pageInfo, visioDocument.themes, "TextColor");
 					themeValWasUsedFor.fontColor = true;
 				}
 
@@ -418,7 +418,7 @@
 
 				let fontSizeCell = characterPropsFinal && characterPropsFinal.getCell("Size");
 				let fontSizePt;
-				if (fontSizeCell && fontSizeCell.kind === AscCommonDraw.c_oVsdxSheetStorageKind.Cell_Type) {
+				if (fontSizeCell && fontSizeCell.kind === AscVisio.c_oVsdxSheetStorageKind.Cell_Type) {
 					// omit calculateCellValue here
 					// let fontColor = calculateCellValue(theme, shape, characterColorCell);
 					const fontSizeIn = Number(fontSizeCell.v);
@@ -481,7 +481,7 @@
 
 				let fontCell = characterPropsFinal && characterPropsFinal.getCell("Font");
 				let cRFonts = new CRFonts();
-				if (fontCell && fontCell.kind === AscCommonDraw.c_oVsdxSheetStorageKind.Cell_Type) {
+				if (fontCell && fontCell.kind === AscVisio.c_oVsdxSheetStorageKind.Cell_Type) {
 					// let fontColor = calculateCellValue(theme, shape, characterColorCell);
 
 					// all document fonts all loaded already in CVisioDocument.prototype.loadFonts
@@ -748,7 +748,7 @@
 
 			// read text
 			textElement.elements.forEach(function(textElementPart, i) {
-				if (typeof textElementPart === "string" || textElementPart.kind === AscCommonDraw.c_oVsdxTextKind.FLD) {
+				if (typeof textElementPart === "string" || textElementPart.kind === AscVisio.c_oVsdxTextKind.FLD) {
 
 					// create defaultParagraph
 					if (oContent.Content.length === 0) {
@@ -775,7 +775,7 @@
 							oRun, lineUniFill, fillUniFill, theme, shape,
 							visioDocument);
 						paragraph.Add_ToContent(paragraph.Content.length - 1, oRun);
-					} else if (textElementPart.kind === AscCommonDraw.c_oVsdxTextKind.FLD) {
+					} else if (textElementPart.kind === AscVisio.c_oVsdxTextKind.FLD) {
 						// text field
 
 						let oFld = new AscCommonWord.CPresentationField(paragraph);
@@ -806,16 +806,16 @@
 						paragraph.AddToContent(paragraph.Content.length - 1, oFld);
 						paragraph.AddToContent(paragraph.Content.length - 1, new ParaRun(paragraph, false));
 					}
-				} else if (textElementPart.kind === AscCommonDraw.c_oVsdxTextKind.PP) {
+				} else if (textElementPart.kind === AscVisio.c_oVsdxTextKind.PP) {
 					// setup Paragraph
 
 					// check defaultParagraph properties: get pp_Type object and in paragraphPropsCommon get needed Row
 					let paragraphRowNum = textElementPart.iX;
 					parseParagraphAndAddToShapeContent(paragraphRowNum, paragraphPropsCommon, textCShape);
 
-				} else if (textElementPart.kind === AscCommonDraw.c_oVsdxTextKind.CP) {
+				} else if (textElementPart.kind === AscVisio.c_oVsdxTextKind.CP) {
 					propsCP = textElementPart;
-				} else if (textElementPart.kind === AscCommonDraw.c_oVsdxTextKind.TP) {
+				} else if (textElementPart.kind === AscVisio.c_oVsdxTextKind.TP) {
 					propsTP = textElementPart;
 				} else {
 					AscCommon.consoleLog("unknown type in text tag");
@@ -1030,7 +1030,7 @@
 			//
 			// // placeholder
 			// let oUniNvPr = new AscFormat.UniNvPr();
-			// oUniNvPr.nvPr.ph = Asc.asc_docs_api.prototype.CreatePlaceholder("object");
+			// oUniNvPr.nvPr.ph = Asc.VisioEditorApi.prototype.CreatePlaceholder("object");
 			//
 			// // cShape.txBody.content2 = cShape.txBody.content;
 			//
@@ -1842,7 +1842,7 @@
 		let flipVertically = paramsObj.flipVertically;
 		let drawingPageScale = paramsObj.drawingPageScale;
 
-		let shapeGeom = AscCommonDraw.getGeometryFromShape(this, drawingPageScale);
+		let shapeGeom = AscVisio.getGeometryFromShape(this, drawingPageScale);
 
 		let sType   = "rect";
 		let nWidth_mm  = Math.round(w_mm);
@@ -1868,7 +1868,7 @@
 	window['AscCommonWord']  = window['AscCommonWord'] || {};
 	window['AscCommonSlide'] = window['AscCommonSlide'] || {};
 	window['AscCommonExcel'] = window['AscCommonExcel'] || {};
-	window['AscCommonDraw']  = window['AscCommonDraw'] || {};
+	window['AscVisio']  = window['AscVisio'] || {};
 	window['AscFormat']  = window['AscFormat'] || {};
 	window['AscWord'] = window['AscWord'] || {};
 
diff --git a/draw/model/ooxmlApi/get-geometry-from-class.js b/visio/model/ooxmlApi/get-geometry-from-class.js
similarity index 99%
rename from draw/model/ooxmlApi/get-geometry-from-class.js
rename to visio/model/ooxmlApi/get-geometry-from-class.js
index 9bfa6c8472..7c3ca9d3d1 100644
--- a/draw/model/ooxmlApi/get-geometry-from-class.js
+++ b/visio/model/ooxmlApi/get-geometry-from-class.js
@@ -804,6 +804,6 @@
 		return master1shape1Geometry;
 	}
 
-	window['AscCommonDraw'].getGeometryFromShape = getGeometryFromShape;
-	window['AscCommonDraw'].getGeometryFromClass = getGeometryFromClass;
+	window['AscVisio'].getGeometryFromShape = getGeometryFromShape;
+	window['AscVisio'].getGeometryFromClass = getGeometryFromClass;
 })(window, window.document);
diff --git a/draw/model/ooxmlApi/ooxmlApiIndex.js b/visio/model/ooxmlApi/ooxmlApiIndex.js
similarity index 98%
rename from draw/model/ooxmlApi/ooxmlApiIndex.js
rename to visio/model/ooxmlApi/ooxmlApiIndex.js
index 18d3cca560..367ccb341f 100644
--- a/draw/model/ooxmlApi/ooxmlApiIndex.js
+++ b/visio/model/ooxmlApi/ooxmlApiIndex.js
@@ -790,7 +790,7 @@
 		if (cellValue === "Themed") {
 			// equal to THEMEVAL() call
 			// add themeval support for every supported cell
-			returnValue = AscCommonDraw.themeval(this, shape, pageInfo, themes, undefined,
+			returnValue = AscVisio.themeval(this, shape, pageInfo, themes, undefined,
 				undefined, gradientEnabled, themedColorsRow);
 
 			if (cellName === "LineColor") {
@@ -1028,7 +1028,7 @@
 		/**
 		 * Shape_Type.prototype.toGeometryAndTextCShapes creates CShape from Shape_Type but for image as an
 		 * exception we make variable to store CImageShape in advance. We read CImageShape on parsing in
-		 * AscCommonDraw.Shape_Type.prototype.fromXml. Because CImageShape needs StaxParser reader object for init.
+		 * AscVisio.Shape_Type.prototype.fromXml. Because CImageShape needs StaxParser reader object for init.
 		 * @type {CImageShape}
 		 */
 		this.cImageShape = null;
@@ -1504,7 +1504,7 @@
 				realizeStyleToSheetObjInheritanceRecursive(styleSheet, styles, stylesWithRealizedInheritance);
 				mergeElementArrays(thisArgument.elements, styleSheet.elements, textStyleElements);
 			}
-			if (thisArgument.constructor === AscCommonDraw.StyleSheet_Type) {
+			if (thisArgument.constructor === AscVisio.StyleSheet_Type) {
 				// memorize: that style has realized inheritance
 				stylesWithRealizedInheritance.add(thisArgument);
 			}
@@ -1525,7 +1525,7 @@
 		realizeStyleToSheetObjInheritanceRecursive(styleSheet, styles, stylesWithRealizedInheritance);
 
 		mergeElementArrays(thisArgument.elements, styleSheet.elements)
-		if (thisArgument.constructor === AscCommonDraw.StyleSheet_Type) {
+		if (thisArgument.constructor === AscVisio.StyleSheet_Type) {
 			// memorize: that style has realized inheritance
 			stylesWithRealizedInheritance.add(thisArgument);
 		}
@@ -1569,7 +1569,7 @@
 		 * @returns {*}
 		 */
 		function findObjectIn(elementsObject, elementToFind) {
-			let objKey = AscCommonDraw.createKeyFromSheetObject(elementToFind);
+			let objKey = AscVisio.createKeyFromSheetObject(elementToFind);
 			return elementsObject[objKey];
 		}
 
@@ -1799,25 +1799,25 @@
 	window['AscCommonWord']  = window['AscCommonWord'] || {};
 	window['AscCommonSlide'] = window['AscCommonSlide'] || {};
 	window['AscCommonExcel'] = window['AscCommonExcel'] || {};
-	window['AscCommonDraw']  = window['AscCommonDraw'] || {};
+	window['AscVisio']  = window['AscVisio'] || {};
 	window['AscFormat']  = window['AscFormat'] || {};
 	window['AscWord'] = window['AscWord'] || {};
 
 
-	window['AscCommonDraw'].c_oVsdxSheetStorageKind = c_oVsdxSheetStorageKind;
-	window['AscCommonDraw'].Text_Type = Text_Type;
-	window['AscCommonDraw'].Data_Type = Data_Type;
-	window['AscCommonDraw'].ForeignData_Type = ForeignData_Type;
-	window['AscCommonDraw'].Trigger_Type = Trigger_Type;
-	window['AscCommonDraw'].Row_Type = Row_Type;
-	window['AscCommonDraw'].Cell_Type = Cell_Type;
-	window['AscCommonDraw'].Shape_Type = Shape_Type;
-	window['AscCommonDraw'].Section_Type = Section_Type;
-	window['AscCommonDraw'].Page_Type = Page_Type;
-	window['AscCommonDraw'].PageSheet_Type = PageSheet_Type;
-	window['AscCommonDraw'].DocumentSheet_Type = DocumentSheet_Type;
-	window['AscCommonDraw'].StyleSheet_Type = StyleSheet_Type;
-	window['AscCommonDraw'].ShapeSheet_Type = ShapeSheet_Type;
-	window['AscCommonDraw'].createKeyFromSheetObject = createKeyFromSheetObject;
+	window['AscVisio'].c_oVsdxSheetStorageKind = c_oVsdxSheetStorageKind;
+	window['AscVisio'].Text_Type = Text_Type;
+	window['AscVisio'].Data_Type = Data_Type;
+	window['AscVisio'].ForeignData_Type = ForeignData_Type;
+	window['AscVisio'].Trigger_Type = Trigger_Type;
+	window['AscVisio'].Row_Type = Row_Type;
+	window['AscVisio'].Cell_Type = Cell_Type;
+	window['AscVisio'].Shape_Type = Shape_Type;
+	window['AscVisio'].Section_Type = Section_Type;
+	window['AscVisio'].Page_Type = Page_Type;
+	window['AscVisio'].PageSheet_Type = PageSheet_Type;
+	window['AscVisio'].DocumentSheet_Type = DocumentSheet_Type;
+	window['AscVisio'].StyleSheet_Type = StyleSheet_Type;
+	window['AscVisio'].ShapeSheet_Type = ShapeSheet_Type;
+	window['AscVisio'].createKeyFromSheetObject = createKeyFromSheetObject;
 
 })(window, window.document);
diff --git a/draw/model/overrides.js b/visio/model/overrides.js
similarity index 100%
rename from draw/model/overrides.js
rename to visio/model/overrides.js
diff --git a/draw/model/visioFunctionsApi.js b/visio/model/visioFunctionsApi.js
similarity index 99%
rename from draw/model/visioFunctionsApi.js
rename to visio/model/visioFunctionsApi.js
index ee4233afba..b48012b659 100644
--- a/draw/model/visioFunctionsApi.js
+++ b/visio/model/visioFunctionsApi.js
@@ -527,10 +527,10 @@
 	window['AscCommonWord']  = window['AscCommonWord'] || {};
 	window['AscCommonSlide'] = window['AscCommonSlide'] || {};
 	window['AscCommonExcel'] = window['AscCommonExcel'] || {};
-	window['AscCommonDraw']  = window['AscCommonDraw'] || {};
+	window['AscVisio']  = window['AscVisio'] || {};
 	window['AscFormat']  = window['AscFormat'] || {};
 	window['AscWord'] = window['AscWord'] || {};
 
-	window['AscCommonDraw'].themeval = themeval;
+	window['AscVisio'].themeval = themeval;
 
 })(window, window.document);
diff --git a/word/Math/NamesOfLiterals.js b/word/Math/NamesOfLiterals.js
index b031267ff7..4729205051 100644
--- a/word/Math/NamesOfLiterals.js
+++ b/word/Math/NamesOfLiterals.js
@@ -7194,8 +7194,8 @@
 				{
 					let oFirstPos	= oMath.Positions[0];
 					let oLastPos	= oMath.Positions[oMath.Positions.length - 1];
-					oMath.AddBefore(oFirstPos, new MathText("〖"));
-					oMath.AddAfter(oLastPos, new MathText("〗"));
+					oMath.AddBefore(oFirstPos, new MathText("〖", oContent));
+					oMath.AddAfter(oLastPos, new MathText("〗", oContent));
 				}
 
 				oContent.Remove_FromContent(nPosCMathContent, 1);