diff --git a/apps/documenteditor/sdk_dev_scripts.js b/apps/documenteditor/sdk_dev_scripts.js
index a63161976f..cff9812c45 100644
--- a/apps/documenteditor/sdk_dev_scripts.js
+++ b/apps/documenteditor/sdk_dev_scripts.js
@@ -16,16 +16,15 @@ var sdk_dev_scrpipts = [
 	"../../../../sdkjs/common/NumFormat.js",
     "../../../../sdkjs/common/SerializeChart.js",
     "../../../../sdkjs/common/AdvancedOptions.js",
-    "../../../../sdkjs/common/FontsFreeType/font_engine.js",
-    "../../../../sdkjs/common/FontsFreeType/FontFile.js",
-    "../../../../sdkjs/common/FontsFreeType/font_map.js",
-	"../../../../sdkjs/common/FontsFreeType/RasterHeapManager.js",
-	"../../../../sdkjs/common/FontsFreeType/GlyphString.js",
-    "../../../../sdkjs/common/FontsFreeType/FontManager.js",
-	"../../../../sdkjs/common/FontsFreeType/FontClassification.js",
-	"../../../../sdkjs/common/FontsFreeType/character.js",
+	"../../../../sdkjs/common/libfont/loader.js",
+	"../../../../sdkjs/common/libfont/manager.js",
+    "../../../../sdkjs/common/libfont/map.js",
+	"../../../../sdkjs/common/libfont/rasterheap.js",
+	"../../../../sdkjs/common/libfont/glyphstring.js",
+	"../../../../sdkjs/common/libfont/classification.js",
+	"../../../../sdkjs/common/libfont/character.js",
     "../../../../sdkjs/common/Drawings/Metafile.js",
-    "../../../../sdkjs/common/FontsFreeType/TextMeasurer.js",
+    "../../../../sdkjs/common/libfont/textmeasurer.js",
     "../../../../sdkjs/common/Drawings/WorkEvents.js",
     "../../../../sdkjs/word/Editor/History.js",
     "../../../../sdkjs/common/Shapes/EditorSettings.js",
diff --git a/apps/presentationeditor/sdk_dev_scripts.js b/apps/presentationeditor/sdk_dev_scripts.js
index 6c7336b75d..6d89b8bd3b 100644
--- a/apps/presentationeditor/sdk_dev_scripts.js
+++ b/apps/presentationeditor/sdk_dev_scripts.js
@@ -16,16 +16,15 @@ var sdk_dev_scrpipts = [
     "../../../../sdkjs/common/NumFormat.js",
     "../../../../sdkjs/common/SerializeChart.js",
     "../../../../sdkjs/common/AdvancedOptions.js",
-    "../../../../sdkjs/common/FontsFreeType/font_engine.js",
-    "../../../../sdkjs/common/FontsFreeType/FontFile.js",
-    "../../../../sdkjs/common/FontsFreeType/font_map.js",
-	"../../../../sdkjs/common/FontsFreeType/RasterHeapManager.js",
-	"../../../../sdkjs/common/FontsFreeType/GlyphString.js",
-    "../../../../sdkjs/common/FontsFreeType/FontManager.js",
-	"../../../../sdkjs/common/FontsFreeType/FontClassification.js",
-	"../../../../sdkjs/common/FontsFreeType/character.js",
+	"../../../../sdkjs/common/libfont/loader.js",
+	"../../../../sdkjs/common/libfont/manager.js",
+    "../../../../sdkjs/common/libfont/map.js",
+	"../../../../sdkjs/common/libfont/rasterheap.js",
+	"../../../../sdkjs/common/libfont/glyphstring.js",
+	"../../../../sdkjs/common/libfont/classification.js",
+	"../../../../sdkjs/common/libfont/character.js",
     "../../../../sdkjs/common/Drawings/Metafile.js",
-    "../../../../sdkjs/common/FontsFreeType/TextMeasurer.js",
+    "../../../../sdkjs/common/libfont/textmeasurer.js",
     "../../../../sdkjs/common/Drawings/WorkEvents.js",
     "../../../../sdkjs/word/Editor/History.js",
     "../../../../sdkjs/common/Shapes/EditorSettings.js",
diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js
index 5cfe913f20..d17026643b 100644
--- a/apps/spreadsheeteditor/sdk_dev_scripts.js
+++ b/apps/spreadsheeteditor/sdk_dev_scripts.js
@@ -25,16 +25,15 @@ var sdk_dev_scrpipts = [
 	"../../../../sdkjs/common/downloaderfiles.js",
 	"../../../../sdkjs/common/NumFormat.js",
 	"../../../../sdkjs/common/SerializeChart.js",
-	"../../../../sdkjs/common/FontsFreeType/font_engine.js",
-        "../../../../sdkjs/common/FontsFreeType/FontFile.js",
-        "../../../../sdkjs/common/FontsFreeType/font_map.js",
-	"../../../../sdkjs/common/FontsFreeType/RasterHeapManager.js",
-	"../../../../sdkjs/common/FontsFreeType/GlyphString.js",
-        "../../../../sdkjs/common/FontsFreeType/FontManager.js",
-	"../../../../sdkjs/common/FontsFreeType/FontClassification.js",
-	"../../../../sdkjs/common/FontsFreeType/character.js",
-	"../../../../sdkjs/common/Drawings/Metafile.js",
-	"../../../../sdkjs/common/FontsFreeType/TextMeasurer.js",
+	"../../../../sdkjs/common/libfont/loader.js",
+	"../../../../sdkjs/common/libfont/manager.js",
+    "../../../../sdkjs/common/libfont/map.js",
+	"../../../../sdkjs/common/libfont/rasterheap.js",
+	"../../../../sdkjs/common/libfont/glyphstring.js",
+	"../../../../sdkjs/common/libfont/classification.js",
+	"../../../../sdkjs/common/libfont/character.js",
+    "../../../../sdkjs/common/Drawings/Metafile.js",
+    "../../../../sdkjs/common/libfont/textmeasurer.js",
 	"../../../../sdkjs/common/Drawings/WorkEvents.js",
 	"../../../../sdkjs/cell/model/History.js",
 	"../../../../sdkjs/common/Shapes/EditorSettings.js",