diff --git a/DesktopEditor/doctrenderer/docbuilder_p.h b/DesktopEditor/doctrenderer/docbuilder_p.h
index 467e4473aa..ad4d96ae76 100644
--- a/DesktopEditor/doctrenderer/docbuilder_p.h
+++ b/DesktopEditor/doctrenderer/docbuilder_p.h
@@ -46,9 +46,9 @@
 #include "../../Common/OfficeFileFormatChecker.h"
 
 #include "js_internal/js_base.h"
-#include "js_internal/embed/NativeBuilderEmbed.h"
-#include "js_internal/embed/NativeControlEmbed.h"
-#include "js_internal/embed/MemoryStreamEmbed.h"
+#include "embed/NativeBuilderEmbed.h"
+#include "embed/NativeControlEmbed.h"
+#include "embed/MemoryStreamEmbed.h"
 
 #ifdef LINUX
 #include <unistd.h>
diff --git a/DesktopEditor/doctrenderer/doctrenderer.cpp b/DesktopEditor/doctrenderer/doctrenderer.cpp
index e5d45bc3fb..7370d4c1f1 100644
--- a/DesktopEditor/doctrenderer/doctrenderer.cpp
+++ b/DesktopEditor/doctrenderer/doctrenderer.cpp
@@ -36,8 +36,8 @@
 #undef BOOL
 #endif
 
-#include "js_internal/embed/NativeControlEmbed.h"
-#include "js_internal/embed/MemoryStreamEmbed.h"
+#include "embed/NativeControlEmbed.h"
+#include "embed/MemoryStreamEmbed.h"
 
 #include "../xml/include/xmlutils.h"
 
diff --git a/DesktopEditor/doctrenderer/doctrenderer.pro b/DesktopEditor/doctrenderer/doctrenderer.pro
index b866e0804f..0a29b84c32 100644
--- a/DesktopEditor/doctrenderer/doctrenderer.pro
+++ b/DesktopEditor/doctrenderer/doctrenderer.pro
@@ -62,22 +62,22 @@ HEADERS += \
     graphics.h
 
 HEADERS += \
-    js_internal/embed/GraphicsEmbed.h \
-    js_internal/embed/MemoryStreamEmbed.h \
-    js_internal/embed/NativeControlEmbed.h \
-    js_internal/embed/NativeBuilderEmbed.h \
+    embed/GraphicsEmbed.h \
+    embed/MemoryStreamEmbed.h \
+    embed/NativeControlEmbed.h \
+    embed/NativeBuilderEmbed.h \
     js_internal/js_base.h \
     js_internal/v8/v8_base.h
 
 SOURCES += \
-    js_internal/embed/GraphicsEmbed.cpp \
-    js_internal/embed/MemoryStreamEmbed.cpp \
-    js_internal/embed/NativeControlEmbed.cpp \
-    js_internal/embed/NativeBuilderEmbed.cpp \
-    js_internal/embed/v8/v8_Graphics.cpp \
-    js_internal/embed/v8/v8_MemoryStream.cpp \
-    js_internal/embed/v8/v8_NativeControl.cpp \
-    js_internal/embed/v8/v8_NativeBuilder.cpp \
+    embed/GraphicsEmbed.cpp \
+    embed/MemoryStreamEmbed.cpp \
+    embed/NativeControlEmbed.cpp \
+    embed/NativeBuilderEmbed.cpp \
+    embed/v8/v8_Graphics.cpp \
+    embed/v8/v8_MemoryStream.cpp \
+    embed/v8/v8_NativeControl.cpp \
+    embed/v8/v8_NativeBuilder.cpp \
     js_internal/v8/v8_base.cpp
 }
 
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/GraphicsEmbed.cpp b/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp
similarity index 100%
rename from DesktopEditor/doctrenderer/js_internal/embed/GraphicsEmbed.cpp
rename to DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/GraphicsEmbed.h b/DesktopEditor/doctrenderer/embed/GraphicsEmbed.h
similarity index 99%
rename from DesktopEditor/doctrenderer/js_internal/embed/GraphicsEmbed.h
rename to DesktopEditor/doctrenderer/embed/GraphicsEmbed.h
index 6b88303b96..c5cebbbcff 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/GraphicsEmbed.h
+++ b/DesktopEditor/doctrenderer/embed/GraphicsEmbed.h
@@ -1,8 +1,8 @@
 #ifndef _BUILD_NATIVE_GRAPHICS_EMBED_H_
 #define _BUILD_NATIVE_GRAPHICS_EMBED_H_
 
-#include "../../graphics.h"
-#include "../js_base.h"
+#include "../graphics.h"
+#include "../js_internal/js_base.h"
 
 using namespace NSJSBase;
 class CGraphicsEmbed : public CJSEmbedObject
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/MemoryStreamEmbed.cpp b/DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.cpp
similarity index 100%
rename from DesktopEditor/doctrenderer/js_internal/embed/MemoryStreamEmbed.cpp
rename to DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.cpp
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/MemoryStreamEmbed.h b/DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.h
similarity index 94%
rename from DesktopEditor/doctrenderer/js_internal/embed/MemoryStreamEmbed.h
rename to DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.h
index 8e2f83aab9..f7ae41856f 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/MemoryStreamEmbed.h
+++ b/DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.h
@@ -1,8 +1,8 @@
 #ifndef _BUILD_NATIVE_MEMORYSTREAM_EMBED_H_
 #define _BUILD_NATIVE_MEMORYSTREAM_EMBED_H_
 
-#include "../../memorystream.h"
-#include "../js_base.h"
+#include "../memorystream.h"
+#include "../js_internal/js_base.h"
 
 using namespace NSJSBase;
 class CMemoryStreamEmbed : public CJSEmbedObject
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/NativeBuilderEmbed.cpp b/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp
similarity index 95%
rename from DesktopEditor/doctrenderer/js_internal/embed/NativeBuilderEmbed.cpp
rename to DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp
index 4ad4aba8d6..31e6c19081 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/NativeBuilderEmbed.cpp
+++ b/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp
@@ -1,7 +1,7 @@
 #include "NativeBuilderEmbed.h"
 
-#include "../../../common/Directory.h"
-#include "../../../fontengine/application_generate_fonts_common.h"
+#include "../../common/Directory.h"
+#include "../../fontengine/application_generate_fonts_common.h"
 
 JSSmart<CJSValue> CBuilderEmbed::builder_OpenFile(JSSmart<CJSValue> sPath, JSSmart<CJSValue> sParams)
 {
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/NativeBuilderEmbed.h b/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h
similarity index 98%
rename from DesktopEditor/doctrenderer/js_internal/embed/NativeBuilderEmbed.h
rename to DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h
index 1611a26d59..f38bf39263 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/NativeBuilderEmbed.h
+++ b/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h
@@ -32,8 +32,8 @@
 #ifndef NATIVECONTROLBUILDER
 #define NATIVECONTROLBUILDER
 
-#include "../../docbuilder.h"
-#include "../js_base.h"
+#include "../docbuilder.h"
+#include "../js_internal/js_base.h"
 
 using namespace NSJSBase;
 class CBuilderEmbed : public CJSEmbedObject
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/NativeControlEmbed.cpp b/DesktopEditor/doctrenderer/embed/NativeControlEmbed.cpp
similarity index 100%
rename from DesktopEditor/doctrenderer/js_internal/embed/NativeControlEmbed.cpp
rename to DesktopEditor/doctrenderer/embed/NativeControlEmbed.cpp
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/NativeControlEmbed.h b/DesktopEditor/doctrenderer/embed/NativeControlEmbed.h
similarity index 97%
rename from DesktopEditor/doctrenderer/js_internal/embed/NativeControlEmbed.h
rename to DesktopEditor/doctrenderer/embed/NativeControlEmbed.h
index 0e28c9b818..4458a67a44 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/NativeControlEmbed.h
+++ b/DesktopEditor/doctrenderer/embed/NativeControlEmbed.h
@@ -1,8 +1,8 @@
 #ifndef _BUILD_NATIVE_NATIVECONTROL_EMBED_H_
 #define _BUILD_NATIVE_NATIVECONTROL_EMBED_H_
 
-#include "../../nativecontrol.h"
-#include "../js_base.h"
+#include "../nativecontrol.h"
+#include "../js_internal/js_base.h"
 
 using namespace NSJSBase;
 class CNativeControlEmbed : public CJSEmbedObject
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/v8/v8_Graphics.cpp b/DesktopEditor/doctrenderer/embed/v8/v8_Graphics.cpp
similarity index 99%
rename from DesktopEditor/doctrenderer/js_internal/embed/v8/v8_Graphics.cpp
rename to DesktopEditor/doctrenderer/embed/v8/v8_Graphics.cpp
index 9a9a22d154..27df4dab4f 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/v8/v8_Graphics.cpp
+++ b/DesktopEditor/doctrenderer/embed/v8/v8_Graphics.cpp
@@ -1,5 +1,5 @@
 #include "../GraphicsEmbed.h"
-#include "../../v8/v8_base.h"
+#include "../../js_internal/v8/v8_base.h"
 
 #define PROPERTY_GET(NAME, NAME_EMBED, TYPE)                                                               \
     void NAME(v8::Local<v8::String> _name, const v8::PropertyCallbackInfo<v8::Value>& info)                \
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/v8/v8_MemoryStream.cpp b/DesktopEditor/doctrenderer/embed/v8/v8_MemoryStream.cpp
similarity index 98%
rename from DesktopEditor/doctrenderer/js_internal/embed/v8/v8_MemoryStream.cpp
rename to DesktopEditor/doctrenderer/embed/v8/v8_MemoryStream.cpp
index 6d74e5fec8..563a73a037 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/v8/v8_MemoryStream.cpp
+++ b/DesktopEditor/doctrenderer/embed/v8/v8_MemoryStream.cpp
@@ -1,5 +1,5 @@
 #include "../MemoryStreamEmbed.h"
-#include "../../v8/v8_base.h"
+#include "../../js_internal/v8/v8_base.h"
 
 namespace NSMemoryStream
 {
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/v8/v8_NativeBuilder.cpp b/DesktopEditor/doctrenderer/embed/v8/v8_NativeBuilder.cpp
similarity index 98%
rename from DesktopEditor/doctrenderer/js_internal/embed/v8/v8_NativeBuilder.cpp
rename to DesktopEditor/doctrenderer/embed/v8/v8_NativeBuilder.cpp
index 53c8a77a6c..13901b0e03 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/v8/v8_NativeBuilder.cpp
+++ b/DesktopEditor/doctrenderer/embed/v8/v8_NativeBuilder.cpp
@@ -30,8 +30,8 @@
  *
  */
 #include "../NativeBuilderEmbed.h"
-#include "../../../docbuilder_p.h"
-#include "../../v8/v8_base.h"
+#include "../../docbuilder_p.h"
+#include "../../js_internal/v8/v8_base.h"
 
 void CBuilderDocumentEmbed::OpenFile(const std::wstring& sFile, const std::wstring& sParams)
 {
diff --git a/DesktopEditor/doctrenderer/js_internal/embed/v8/v8_NativeControl.cpp b/DesktopEditor/doctrenderer/embed/v8/v8_NativeControl.cpp
similarity index 99%
rename from DesktopEditor/doctrenderer/js_internal/embed/v8/v8_NativeControl.cpp
rename to DesktopEditor/doctrenderer/embed/v8/v8_NativeControl.cpp
index 1c6985b9d9..04bf90f877 100644
--- a/DesktopEditor/doctrenderer/js_internal/embed/v8/v8_NativeControl.cpp
+++ b/DesktopEditor/doctrenderer/embed/v8/v8_NativeControl.cpp
@@ -1,5 +1,5 @@
 #include "../NativeControlEmbed.h"
-#include "../../v8/v8_base.h"
+#include "../../js_internal/v8/v8_base.h"
 
 namespace NSNativeControl
 {