diff --git a/README.md b/README.md
index d72a05d..7f2a705 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+# Fork to fix error -> https://github.com/Hopding/react-native-pdf-lib/issues/57
+
 # react-native-pdf-lib
 
 ## Purpose
diff --git a/ios/RNReactNativePdfLib.podspec b/ios/RNReactNativePdfLib.podspec
index c253564..b05a253 100644
--- a/ios/RNReactNativePdfLib.podspec
+++ b/ios/RNReactNativePdfLib.podspec
@@ -15,5 +15,6 @@ Pod::Spec.new do |s|
   s.platform              = :ios, '9.0'
   s.ios.deployment_target = '8.0'
   s.dependency 'React'
-  s.source_files  = "*.{h,m}"
+  s.source_files  = "*.{h,mm}", "lib/**/*"
+  s.ios.vendored_libraries = ["lib/universal/libFreeType.a", "lib/universal/libLibJpeg.a", "lib/universal/libLibTiff.a", "lib/universal/libPDFWriter.a", "lib/universal/libZlib.a"]
 end
diff --git a/ios/lib/include/freetype/internal/autohint.h b/ios/lib/include/autohint.h
similarity index 100%
rename from ios/lib/include/freetype/internal/autohint.h
rename to ios/lib/include/autohint.h
diff --git a/ios/lib/include/freetype/freetype.h b/ios/lib/include/freetype.h
similarity index 100%
rename from ios/lib/include/freetype/freetype.h
rename to ios/lib/include/freetype.h
diff --git a/ios/lib/include/ft2build.h b/ios/lib/include/ft2build.h
index 41e6e6b..27814b1 100755
--- a/ios/lib/include/ft2build.h
+++ b/ios/lib/include/ft2build.h
@@ -31,7 +31,7 @@
 #ifndef __FT2_BUILD_GENERIC_H__
 #define __FT2_BUILD_GENERIC_H__
 
-#include <freetype/config/ftheader.h>
+#include <ftheader.h>
 
 #endif /* __FT2_BUILD_GENERIC_H__ */
 
diff --git a/ios/lib/include/freetype/ftadvanc.h b/ios/lib/include/ftadvanc.h
similarity index 100%
rename from ios/lib/include/freetype/ftadvanc.h
rename to ios/lib/include/ftadvanc.h
diff --git a/ios/lib/include/freetype/ftautoh.h b/ios/lib/include/ftautoh.h
similarity index 100%
rename from ios/lib/include/freetype/ftautoh.h
rename to ios/lib/include/ftautoh.h
diff --git a/ios/lib/include/freetype/ftbbox.h b/ios/lib/include/ftbbox.h
similarity index 100%
rename from ios/lib/include/freetype/ftbbox.h
rename to ios/lib/include/ftbbox.h
diff --git a/ios/lib/include/freetype/ftbdf.h b/ios/lib/include/ftbdf.h
similarity index 100%
rename from ios/lib/include/freetype/ftbdf.h
rename to ios/lib/include/ftbdf.h
diff --git a/ios/lib/include/freetype/ftbitmap.h b/ios/lib/include/ftbitmap.h
similarity index 100%
rename from ios/lib/include/freetype/ftbitmap.h
rename to ios/lib/include/ftbitmap.h
diff --git a/ios/lib/include/freetype/ftbzip2.h b/ios/lib/include/ftbzip2.h
similarity index 100%
rename from ios/lib/include/freetype/ftbzip2.h
rename to ios/lib/include/ftbzip2.h
diff --git a/ios/lib/include/freetype/ftcache.h b/ios/lib/include/ftcache.h
similarity index 100%
rename from ios/lib/include/freetype/ftcache.h
rename to ios/lib/include/ftcache.h
diff --git a/ios/lib/include/freetype/internal/ftcalc.h b/ios/lib/include/ftcalc.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftcalc.h
rename to ios/lib/include/ftcalc.h
diff --git a/ios/lib/include/freetype/ftchapters.h b/ios/lib/include/ftchapters.h
similarity index 100%
rename from ios/lib/include/freetype/ftchapters.h
rename to ios/lib/include/ftchapters.h
diff --git a/ios/lib/include/freetype/ftcid.h b/ios/lib/include/ftcid.h
similarity index 100%
rename from ios/lib/include/freetype/ftcid.h
rename to ios/lib/include/ftcid.h
diff --git a/ios/lib/include/freetype/config/ftconfig.h b/ios/lib/include/ftconfig.h
similarity index 100%
rename from ios/lib/include/freetype/config/ftconfig.h
rename to ios/lib/include/ftconfig.h
diff --git a/ios/lib/include/freetype/internal/ftdebug.h b/ios/lib/include/ftdebug.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftdebug.h
rename to ios/lib/include/ftdebug.h
diff --git a/ios/lib/include/freetype/internal/ftdriver.h b/ios/lib/include/ftdriver.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftdriver.h
rename to ios/lib/include/ftdriver.h
diff --git a/ios/lib/include/freetype/fterrdef.h b/ios/lib/include/fterrdef.h
similarity index 100%
rename from ios/lib/include/freetype/fterrdef.h
rename to ios/lib/include/fterrdef.h
diff --git a/ios/lib/include/freetype/fterrors.h b/ios/lib/include/fterrors.h
similarity index 100%
rename from ios/lib/include/freetype/fterrors.h
rename to ios/lib/include/fterrors.h
diff --git a/ios/lib/include/freetype/ftgasp.h b/ios/lib/include/ftgasp.h
similarity index 100%
rename from ios/lib/include/freetype/ftgasp.h
rename to ios/lib/include/ftgasp.h
diff --git a/ios/lib/include/freetype/internal/ftgloadr.h b/ios/lib/include/ftgloadr.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftgloadr.h
rename to ios/lib/include/ftgloadr.h
diff --git a/ios/lib/include/freetype/ftglyph.h b/ios/lib/include/ftglyph.h
similarity index 100%
rename from ios/lib/include/freetype/ftglyph.h
rename to ios/lib/include/ftglyph.h
diff --git a/ios/lib/include/freetype/ftgxval.h b/ios/lib/include/ftgxval.h
similarity index 100%
rename from ios/lib/include/freetype/ftgxval.h
rename to ios/lib/include/ftgxval.h
diff --git a/ios/lib/include/freetype/ftgzip.h b/ios/lib/include/ftgzip.h
similarity index 100%
rename from ios/lib/include/freetype/ftgzip.h
rename to ios/lib/include/ftgzip.h
diff --git a/ios/lib/include/freetype/config/ftheader.h b/ios/lib/include/ftheader.h
similarity index 86%
rename from ios/lib/include/freetype/config/ftheader.h
rename to ios/lib/include/ftheader.h
index 765a6e2..9da11dd 100755
--- a/ios/lib/include/freetype/config/ftheader.h
+++ b/ios/lib/include/ftheader.h
@@ -107,7 +107,7 @@
    *
    */
 #ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H  <freetype/config/ftconfig.h>
+#define FT_CONFIG_CONFIG_H  <ftconfig.h>
 #endif
 
 
@@ -122,7 +122,7 @@
    *
    */
 #ifndef FT_CONFIG_STANDARD_LIBRARY_H
-#define FT_CONFIG_STANDARD_LIBRARY_H  <freetype/config/ftstdlib.h>
+#define FT_CONFIG_STANDARD_LIBRARY_H  <ftstdlib.h>
 #endif
 
 
@@ -137,7 +137,7 @@
    *
    */
 #ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H  <freetype/config/ftoption.h>
+#define FT_CONFIG_OPTIONS_H  <ftoption.h>
 #endif
 
 
@@ -153,7 +153,7 @@
    *
    */
 #ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H  <freetype/config/ftmodule.h>
+#define FT_CONFIG_MODULES_H  <ftmodule.h>
 #endif
 
   /* */
@@ -170,7 +170,7 @@
    *   base FreeType~2 API.
    *
    */
-#define FT_FREETYPE_H  <freetype/freetype.h>
+#define FT_FREETYPE_H  <freetype.h>
 
 
   /*************************************************************************
@@ -185,7 +185,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_ERRORS_H  <freetype/fterrors.h>
+#define FT_ERRORS_H  <fterrors.h>
 
 
   /*************************************************************************
@@ -198,7 +198,7 @@
    *   list of FreeType~2 module error offsets (and messages).
    *
    */
-#define FT_MODULE_ERRORS_H  <freetype/ftmoderr.h>
+#define FT_MODULE_ERRORS_H  <ftmoderr.h>
 
 
   /*************************************************************************
@@ -214,7 +214,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_SYSTEM_H  <freetype/ftsystem.h>
+#define FT_SYSTEM_H  <ftsystem.h>
 
 
   /*************************************************************************
@@ -230,7 +230,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_IMAGE_H  <freetype/ftimage.h>
+#define FT_IMAGE_H  <ftimage.h>
 
 
   /*************************************************************************
@@ -245,7 +245,7 @@
    *   It is included by @FT_FREETYPE_H.
    *
    */
-#define FT_TYPES_H  <freetype/fttypes.h>
+#define FT_TYPES_H  <fttypes.h>
 
 
   /*************************************************************************
@@ -260,7 +260,7 @@
    *   (Most applications will never need to include this file.)
    *
    */
-#define FT_LIST_H  <freetype/ftlist.h>
+#define FT_LIST_H  <ftlist.h>
 
 
   /*************************************************************************
@@ -273,7 +273,7 @@
    *   scalable outline management API of FreeType~2.
    *
    */
-#define FT_OUTLINE_H  <freetype/ftoutln.h>
+#define FT_OUTLINE_H  <ftoutln.h>
 
 
   /*************************************************************************
@@ -286,7 +286,7 @@
    *   API which manages multiple @FT_Size objects per face.
    *
    */
-#define FT_SIZES_H  <freetype/ftsizes.h>
+#define FT_SIZES_H  <ftsizes.h>
 
 
   /*************************************************************************
@@ -299,7 +299,7 @@
    *   module management API of FreeType~2.
    *
    */
-#define FT_MODULE_H  <freetype/ftmodapi.h>
+#define FT_MODULE_H  <ftmodapi.h>
 
 
   /*************************************************************************
@@ -312,7 +312,7 @@
    *   renderer module management API of FreeType~2.
    *
    */
-#define FT_RENDER_H  <freetype/ftrender.h>
+#define FT_RENDER_H  <ftrender.h>
 
 
   /*************************************************************************
@@ -325,7 +325,7 @@
    *   structures and macros related to the auto-hinting module.
    *
    */
-#define FT_AUTOHINTER_H  <freetype/ftautoh.h>
+#define FT_AUTOHINTER_H  <ftautoh.h>
 
 
   /*************************************************************************
@@ -338,7 +338,7 @@
    *   types and API specific to the Type~1 format.
    *
    */
-#define FT_TYPE1_TABLES_H  <freetype/t1tables.h>
+#define FT_TYPE1_TABLES_H  <t1tables.h>
 
 
   /*************************************************************************
@@ -353,7 +353,7 @@
    *   definitions, taken from the TrueType and OpenType specifications.
    *
    */
-#define FT_TRUETYPE_IDS_H  <freetype/ttnameid.h>
+#define FT_TRUETYPE_IDS_H  <ttnameid.h>
 
 
   /*************************************************************************
@@ -366,7 +366,7 @@
    *   types and API specific to the TrueType (as well as OpenType) format.
    *
    */
-#define FT_TRUETYPE_TABLES_H  <freetype/tttables.h>
+#define FT_TRUETYPE_TABLES_H  <tttables.h>
 
 
   /*************************************************************************
@@ -380,7 +380,7 @@
    *   SFNT-based font formats (i.e., TrueType and OpenType).
    *
    */
-#define FT_TRUETYPE_TAGS_H  <freetype/tttags.h>
+#define FT_TRUETYPE_TAGS_H  <tttags.h>
 
 
   /*************************************************************************
@@ -394,7 +394,7 @@
    *   face.
    *
    */
-#define FT_BDF_H  <freetype/ftbdf.h>
+#define FT_BDF_H  <ftbdf.h>
 
 
   /*************************************************************************
@@ -408,7 +408,7 @@
    *   face.
    *
    */
-#define FT_CID_H  <freetype/ftcid.h>
+#define FT_CID_H  <ftcid.h>
 
 
   /*************************************************************************
@@ -421,7 +421,7 @@
    *   definitions of an API which supports gzip-compressed files.
    *
    */
-#define FT_GZIP_H  <freetype/ftgzip.h>
+#define FT_GZIP_H  <ftgzip.h>
 
 
   /*************************************************************************
@@ -434,7 +434,7 @@
    *   definitions of an API which supports LZW-compressed files.
    *
    */
-#define FT_LZW_H  <freetype/ftlzw.h>
+#define FT_LZW_H  <ftlzw.h>
 
 
   /*************************************************************************
@@ -447,7 +447,7 @@
    *   definitions of an API which supports bzip2-compressed files.
    *
    */
-#define FT_BZIP2_H  <freetype/ftbzip2.h>
+#define FT_BZIP2_H  <ftbzip2.h>
 
 
   /*************************************************************************
@@ -460,7 +460,7 @@
    *   definitions of an API which supports Windows FNT files.
    *
    */
-#define FT_WINFONTS_H   <freetype/ftwinfnt.h>
+#define FT_WINFONTS_H   <ftwinfnt.h>
 
 
   /*************************************************************************
@@ -473,7 +473,7 @@
    *   API of the optional glyph management component.
    *
    */
-#define FT_GLYPH_H  <freetype/ftglyph.h>
+#define FT_GLYPH_H  <ftglyph.h>
 
 
   /*************************************************************************
@@ -486,7 +486,7 @@
    *   API of the optional bitmap conversion component.
    *
    */
-#define FT_BITMAP_H  <freetype/ftbitmap.h>
+#define FT_BITMAP_H  <ftbitmap.h>
 
 
   /*************************************************************************
@@ -499,7 +499,7 @@
    *   API of the optional exact bounding box computation routines.
    *
    */
-#define FT_BBOX_H  <freetype/ftbbox.h>
+#define FT_BBOX_H  <ftbbox.h>
 
 
   /*************************************************************************
@@ -512,7 +512,7 @@
    *   API of the optional FreeType~2 cache sub-system.
    *
    */
-#define FT_CACHE_H  <freetype/ftcache.h>
+#define FT_CACHE_H  <ftcache.h>
 
 
   /*************************************************************************
@@ -586,7 +586,7 @@
    *   compiled on the Mac (note that the base API still works though).
    *
    */
-#define FT_MAC_H  <freetype/ftmac.h>
+#define FT_MAC_H  <ftmac.h>
 
 
   /*************************************************************************
@@ -599,7 +599,7 @@
    *   optional multiple-masters management API of FreeType~2.
    *
    */
-#define FT_MULTIPLE_MASTERS_H  <freetype/ftmm.h>
+#define FT_MULTIPLE_MASTERS_H  <ftmm.h>
 
 
   /*************************************************************************
@@ -613,7 +613,7 @@
    *   SFNT-based font formats (i.e., TrueType and OpenType).
    *
    */
-#define FT_SFNT_NAMES_H  <freetype/ftsnames.h>
+#define FT_SFNT_NAMES_H  <ftsnames.h>
 
 
   /*************************************************************************
@@ -627,7 +627,7 @@
    *   GPOS, GSUB, JSTF).
    *
    */
-#define FT_OPENTYPE_VALIDATE_H  <freetype/ftotval.h>
+#define FT_OPENTYPE_VALIDATE_H  <ftotval.h>
 
 
   /*************************************************************************
@@ -641,7 +641,7 @@
    *   mort, morx, bsln, just, kern, opbd, trak, prop).
    *
    */
-#define FT_GX_VALIDATE_H  <freetype/ftgxval.h>
+#define FT_GX_VALIDATE_H  <ftgxval.h>
 
 
   /*************************************************************************
@@ -654,7 +654,7 @@
    *   FreeType~2 API which accesses PFR-specific data.
    *
    */
-#define FT_PFR_H  <freetype/ftpfr.h>
+#define FT_PFR_H  <ftpfr.h>
 
 
   /*************************************************************************
@@ -666,7 +666,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which provides functions to stroke outline paths.
    */
-#define FT_STROKER_H  <freetype/ftstroke.h>
+#define FT_STROKER_H  <ftstroke.h>
 
 
   /*************************************************************************
@@ -678,7 +678,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs artificial obliquing and emboldening.
    */
-#define FT_SYNTHESIS_H  <freetype/ftsynth.h>
+#define FT_SYNTHESIS_H  <ftsynth.h>
 
 
   /*************************************************************************
@@ -691,7 +691,7 @@
    *   FreeType~2 API which provides functions specific to the XFree86 and
    *   X.Org X11 servers.
    */
-#define FT_XFREE86_H  <freetype/ftxf86.h>
+#define FT_XFREE86_H  <ftxf86.h>
 
 
   /*************************************************************************
@@ -704,7 +704,7 @@
    *   FreeType~2 API which performs trigonometric computations (e.g.,
    *   cosines and arc tangents).
    */
-#define FT_TRIGONOMETRY_H  <freetype/fttrigon.h>
+#define FT_TRIGONOMETRY_H  <fttrigon.h>
 
 
   /*************************************************************************
@@ -716,7 +716,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_LCD_FILTER_H  <freetype/ftlcdfil.h>
+#define FT_LCD_FILTER_H  <ftlcdfil.h>
 
 
   /*************************************************************************
@@ -728,7 +728,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_UNPATENTED_HINTING_H  <freetype/ttunpat.h>
+#define FT_UNPATENTED_HINTING_H  <ttunpat.h>
 
 
   /*************************************************************************
@@ -740,7 +740,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which performs color filtering for subpixel rendering.
    */
-#define FT_INCREMENTAL_H  <freetype/ftincrem.h>
+#define FT_INCREMENTAL_H  <ftincrem.h>
 
 
   /*************************************************************************
@@ -752,7 +752,7 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which returns entries from the TrueType GASP table.
    */
-#define FT_GASP_H  <freetype/ftgasp.h>
+#define FT_GASP_H  <ftgasp.h>
 
 
   /*************************************************************************
@@ -764,38 +764,38 @@
    *   A macro used in #include statements to name the file containing the
    *   FreeType~2 API which returns individual and ranged glyph advances.
    */
-#define FT_ADVANCES_H  <freetype/ftadvanc.h>
+#define FT_ADVANCES_H  <ftadvanc.h>
 
 
   /* */
 
-#define FT_ERROR_DEFINITIONS_H  <freetype/fterrdef.h>
+#define FT_ERROR_DEFINITIONS_H  <fterrdef.h>
 
 
   /* The internals of the cache sub-system are no longer exposed.  We */
   /* default to FT_CACHE_H at the moment just in case, but we know of */
   /* no rogue client that uses them.                                  */
   /*                                                                  */
-#define FT_CACHE_MANAGER_H           <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MRU_H      <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_MANAGER_H  <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_CACHE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_GLYPH_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_IMAGE_H    <freetype/ftcache.h>
-#define FT_CACHE_INTERNAL_SBITS_H    <freetype/ftcache.h>
+#define FT_CACHE_MANAGER_H           <ftcache.h>
+#define FT_CACHE_INTERNAL_MRU_H      <ftcache.h>
+#define FT_CACHE_INTERNAL_MANAGER_H  <ftcache.h>
+#define FT_CACHE_INTERNAL_CACHE_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_GLYPH_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_IMAGE_H    <ftcache.h>
+#define FT_CACHE_INTERNAL_SBITS_H    <ftcache.h>
 
 
-#define FT_INCREMENTAL_H          <freetype/ftincrem.h>
+#define FT_INCREMENTAL_H          <ftincrem.h>
 
-#define FT_TRUETYPE_UNPATENTED_H  <freetype/ttunpat.h>
+#define FT_TRUETYPE_UNPATENTED_H  <ttunpat.h>
 
 
   /*
-   * Include internal headers definitions from <freetype/internal/...>
+   * Include internal headers definitions from <...>
    * only when building the library.
    */
 #ifdef FT2_BUILD_LIBRARY
-#define  FT_INTERNAL_INTERNAL_H  <freetype/internal/internal.h>
+#define  FT_INTERNAL_INTERNAL_H  <internal.h>
 #include FT_INTERNAL_INTERNAL_H
 #endif /* FT2_BUILD_LIBRARY */
 
diff --git a/ios/lib/include/freetype/ftimage.h b/ios/lib/include/ftimage.h
similarity index 100%
rename from ios/lib/include/freetype/ftimage.h
rename to ios/lib/include/ftimage.h
diff --git a/ios/lib/include/freetype/ftincrem.h b/ios/lib/include/ftincrem.h
similarity index 100%
rename from ios/lib/include/freetype/ftincrem.h
rename to ios/lib/include/ftincrem.h
diff --git a/ios/lib/include/freetype/ftlcdfil.h b/ios/lib/include/ftlcdfil.h
similarity index 100%
rename from ios/lib/include/freetype/ftlcdfil.h
rename to ios/lib/include/ftlcdfil.h
diff --git a/ios/lib/include/freetype/ftlist.h b/ios/lib/include/ftlist.h
similarity index 100%
rename from ios/lib/include/freetype/ftlist.h
rename to ios/lib/include/ftlist.h
diff --git a/ios/lib/include/freetype/ftlzw.h b/ios/lib/include/ftlzw.h
similarity index 100%
rename from ios/lib/include/freetype/ftlzw.h
rename to ios/lib/include/ftlzw.h
diff --git a/ios/lib/include/freetype/ftmac.h b/ios/lib/include/ftmac.h
similarity index 97%
rename from ios/lib/include/freetype/ftmac.h
rename to ios/lib/include/ftmac.h
index 2f9d5a9..c793417 100755
--- a/ios/lib/include/freetype/ftmac.h
+++ b/ios/lib/include/ftmac.h
@@ -18,7 +18,7 @@
 
 /***************************************************************************/
 /*                                                                         */
-/* NOTE: Include this file after <freetype/freetype.h> and after any       */
+/* NOTE: Include this file after <freetype.h> and after any       */
 /*       Mac-specific headers (because this header uses Mac types such as  */
 /*       Handle, FSSpec, FSRef, etc.)                                      */
 /*                                                                         */
diff --git a/ios/lib/include/freetype/internal/ftmemory.h b/ios/lib/include/ftmemory.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftmemory.h
rename to ios/lib/include/ftmemory.h
diff --git a/ios/lib/include/freetype/ftmm.h b/ios/lib/include/ftmm.h
similarity index 100%
rename from ios/lib/include/freetype/ftmm.h
rename to ios/lib/include/ftmm.h
diff --git a/ios/lib/include/freetype/ftmodapi.h b/ios/lib/include/ftmodapi.h
similarity index 100%
rename from ios/lib/include/freetype/ftmodapi.h
rename to ios/lib/include/ftmodapi.h
diff --git a/ios/lib/include/freetype/ftmoderr.h b/ios/lib/include/ftmoderr.h
similarity index 100%
rename from ios/lib/include/freetype/ftmoderr.h
rename to ios/lib/include/ftmoderr.h
diff --git a/ios/lib/include/freetype/config/ftmodule.h b/ios/lib/include/ftmodule.h
similarity index 100%
rename from ios/lib/include/freetype/config/ftmodule.h
rename to ios/lib/include/ftmodule.h
diff --git a/ios/lib/include/freetype/internal/ftobjs.h b/ios/lib/include/ftobjs.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftobjs.h
rename to ios/lib/include/ftobjs.h
diff --git a/ios/lib/include/freetype/config/ftoption.h b/ios/lib/include/ftoption.h
similarity index 98%
rename from ios/lib/include/freetype/config/ftoption.h
rename to ios/lib/include/ftoption.h
index 725a38a..9c718b9 100755
--- a/ios/lib/include/freetype/config/ftoption.h
+++ b/ios/lib/include/ftoption.h
@@ -51,7 +51,7 @@ FT_BEGIN_HEADER
   /*    locate this file during the build.  For example,                   */
   /*                                                                       */
   /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
+  /*      #include <ftheader.h>                            */
   /*                                                                       */
   /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
   /*    definitions.                                                       */
@@ -59,7 +59,7 @@ FT_BEGIN_HEADER
   /*    Note also that you can similarly pre-define the macro              */
   /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
   /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
+  /*    default, this file is <ftmodule.h>.                */
   /*                                                                       */
   /*  We highly recommend using the third method whenever possible.        */
   /*                                                                       */
diff --git a/ios/lib/include/freetype/ftotval.h b/ios/lib/include/ftotval.h
similarity index 100%
rename from ios/lib/include/freetype/ftotval.h
rename to ios/lib/include/ftotval.h
diff --git a/ios/lib/include/freetype/ftoutln.h b/ios/lib/include/ftoutln.h
similarity index 100%
rename from ios/lib/include/freetype/ftoutln.h
rename to ios/lib/include/ftoutln.h
diff --git a/ios/lib/include/freetype/ftpfr.h b/ios/lib/include/ftpfr.h
similarity index 100%
rename from ios/lib/include/freetype/ftpfr.h
rename to ios/lib/include/ftpfr.h
diff --git a/ios/lib/include/freetype/internal/ftpic.h b/ios/lib/include/ftpic.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftpic.h
rename to ios/lib/include/ftpic.h
diff --git a/ios/lib/include/freetype/ftrender.h b/ios/lib/include/ftrender.h
similarity index 100%
rename from ios/lib/include/freetype/ftrender.h
rename to ios/lib/include/ftrender.h
diff --git a/ios/lib/include/freetype/internal/ftrfork.h b/ios/lib/include/ftrfork.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftrfork.h
rename to ios/lib/include/ftrfork.h
diff --git a/ios/lib/include/freetype/internal/ftserv.h b/ios/lib/include/ftserv.h
similarity index 94%
rename from ios/lib/include/freetype/internal/ftserv.h
rename to ios/lib/include/ftserv.h
index db86427..03d3900 100755
--- a/ios/lib/include/freetype/internal/ftserv.h
+++ b/ios/lib/include/ftserv.h
@@ -666,24 +666,24 @@ FT_BEGIN_HEADER
    *  The header files containing the services.
    */
 
-#define FT_SERVICE_BDF_H                <freetype/internal/services/svbdf.h>
-#define FT_SERVICE_CID_H                <freetype/internal/services/svcid.h>
-#define FT_SERVICE_GLYPH_DICT_H         <freetype/internal/services/svgldict.h>
-#define FT_SERVICE_GX_VALIDATE_H        <freetype/internal/services/svgxval.h>
-#define FT_SERVICE_KERNING_H            <freetype/internal/services/svkern.h>
-#define FT_SERVICE_MULTIPLE_MASTERS_H   <freetype/internal/services/svmm.h>
-#define FT_SERVICE_OPENTYPE_VALIDATE_H  <freetype/internal/services/svotval.h>
-#define FT_SERVICE_PFR_H                <freetype/internal/services/svpfr.h>
-#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <freetype/internal/services/svpscmap.h>
-#define FT_SERVICE_POSTSCRIPT_INFO_H    <freetype/internal/services/svpsinfo.h>
-#define FT_SERVICE_POSTSCRIPT_NAME_H    <freetype/internal/services/svpostnm.h>
-#define FT_SERVICE_PROPERTIES_H         <freetype/internal/services/svprop.h>
-#define FT_SERVICE_SFNT_H               <freetype/internal/services/svsfnt.h>
-#define FT_SERVICE_TRUETYPE_ENGINE_H    <freetype/internal/services/svtteng.h>
-#define FT_SERVICE_TT_CMAP_H            <freetype/internal/services/svttcmap.h>
-#define FT_SERVICE_WINFNT_H             <freetype/internal/services/svwinfnt.h>
-#define FT_SERVICE_XFREE86_NAME_H       <freetype/internal/services/svxf86nm.h>
-#define FT_SERVICE_TRUETYPE_GLYF_H      <freetype/internal/services/svttglyf.h>
+#define FT_SERVICE_BDF_H                <svbdf.h>
+#define FT_SERVICE_CID_H                <svcid.h>
+#define FT_SERVICE_GLYPH_DICT_H         <svgldict.h>
+#define FT_SERVICE_GX_VALIDATE_H        <svgxval.h>
+#define FT_SERVICE_KERNING_H            <svkern.h>
+#define FT_SERVICE_MULTIPLE_MASTERS_H   <svmm.h>
+#define FT_SERVICE_OPENTYPE_VALIDATE_H  <svotval.h>
+#define FT_SERVICE_PFR_H                <svpfr.h>
+#define FT_SERVICE_POSTSCRIPT_CMAPS_H   <svpscmap.h>
+#define FT_SERVICE_POSTSCRIPT_INFO_H    <svpsinfo.h>
+#define FT_SERVICE_POSTSCRIPT_NAME_H    <svpostnm.h>
+#define FT_SERVICE_PROPERTIES_H         <svprop.h>
+#define FT_SERVICE_SFNT_H               <svsfnt.h>
+#define FT_SERVICE_TRUETYPE_ENGINE_H    <svtteng.h>
+#define FT_SERVICE_TT_CMAP_H            <svttcmap.h>
+#define FT_SERVICE_WINFNT_H             <svwinfnt.h>
+#define FT_SERVICE_XFREE86_NAME_H       <svxf86nm.h>
+#define FT_SERVICE_TRUETYPE_GLYF_H      <svttglyf.h>
 
  /* */
 
diff --git a/ios/lib/include/freetype/ftsizes.h b/ios/lib/include/ftsizes.h
similarity index 100%
rename from ios/lib/include/freetype/ftsizes.h
rename to ios/lib/include/ftsizes.h
diff --git a/ios/lib/include/freetype/ftsnames.h b/ios/lib/include/ftsnames.h
similarity index 100%
rename from ios/lib/include/freetype/ftsnames.h
rename to ios/lib/include/ftsnames.h
diff --git a/ios/lib/include/freetype/config/ftstdlib.h b/ios/lib/include/ftstdlib.h
similarity index 100%
rename from ios/lib/include/freetype/config/ftstdlib.h
rename to ios/lib/include/ftstdlib.h
diff --git a/ios/lib/include/freetype/internal/ftstream.h b/ios/lib/include/ftstream.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftstream.h
rename to ios/lib/include/ftstream.h
diff --git a/ios/lib/include/freetype/ftstroke.h b/ios/lib/include/ftstroke.h
similarity index 100%
rename from ios/lib/include/freetype/ftstroke.h
rename to ios/lib/include/ftstroke.h
diff --git a/ios/lib/include/freetype/ftsynth.h b/ios/lib/include/ftsynth.h
similarity index 100%
rename from ios/lib/include/freetype/ftsynth.h
rename to ios/lib/include/ftsynth.h
diff --git a/ios/lib/include/freetype/ftsystem.h b/ios/lib/include/ftsystem.h
similarity index 100%
rename from ios/lib/include/freetype/ftsystem.h
rename to ios/lib/include/ftsystem.h
diff --git a/ios/lib/include/freetype/internal/fttrace.h b/ios/lib/include/fttrace.h
similarity index 100%
rename from ios/lib/include/freetype/internal/fttrace.h
rename to ios/lib/include/fttrace.h
diff --git a/ios/lib/include/freetype/fttrigon.h b/ios/lib/include/fttrigon.h
similarity index 100%
rename from ios/lib/include/freetype/fttrigon.h
rename to ios/lib/include/fttrigon.h
diff --git a/ios/lib/include/freetype/fttypes.h b/ios/lib/include/fttypes.h
similarity index 100%
rename from ios/lib/include/freetype/fttypes.h
rename to ios/lib/include/fttypes.h
diff --git a/ios/lib/include/freetype/internal/ftvalid.h b/ios/lib/include/ftvalid.h
similarity index 100%
rename from ios/lib/include/freetype/internal/ftvalid.h
rename to ios/lib/include/ftvalid.h
diff --git a/ios/lib/include/freetype/ftwinfnt.h b/ios/lib/include/ftwinfnt.h
similarity index 100%
rename from ios/lib/include/freetype/ftwinfnt.h
rename to ios/lib/include/ftwinfnt.h
diff --git a/ios/lib/include/freetype/ftxf86.h b/ios/lib/include/ftxf86.h
similarity index 100%
rename from ios/lib/include/freetype/ftxf86.h
rename to ios/lib/include/ftxf86.h
diff --git a/ios/lib/include/freetype/internal/internal.h b/ios/lib/include/internal.h
similarity index 55%
rename from ios/lib/include/freetype/internal/internal.h
rename to ios/lib/include/internal.h
index 8424e08..ca29b17 100755
--- a/ios/lib/include/freetype/internal/internal.h
+++ b/ios/lib/include/internal.h
@@ -24,28 +24,28 @@
   /*************************************************************************/
 
 
-#define FT_INTERNAL_OBJECTS_H             <freetype/internal/ftobjs.h>
-#define FT_INTERNAL_PIC_H                 <freetype/internal/ftpic.h>
-#define FT_INTERNAL_STREAM_H              <freetype/internal/ftstream.h>
-#define FT_INTERNAL_MEMORY_H              <freetype/internal/ftmemory.h>
-#define FT_INTERNAL_DEBUG_H               <freetype/internal/ftdebug.h>
-#define FT_INTERNAL_CALC_H                <freetype/internal/ftcalc.h>
-#define FT_INTERNAL_DRIVER_H              <freetype/internal/ftdriver.h>
-#define FT_INTERNAL_TRACE_H               <freetype/internal/fttrace.h>
-#define FT_INTERNAL_GLYPH_LOADER_H        <freetype/internal/ftgloadr.h>
-#define FT_INTERNAL_SFNT_H                <freetype/internal/sfnt.h>
-#define FT_INTERNAL_SERVICE_H             <freetype/internal/ftserv.h>
-#define FT_INTERNAL_RFORK_H               <freetype/internal/ftrfork.h>
-#define FT_INTERNAL_VALIDATE_H            <freetype/internal/ftvalid.h>
-
-#define FT_INTERNAL_TRUETYPE_TYPES_H      <freetype/internal/tttypes.h>
-#define FT_INTERNAL_TYPE1_TYPES_H         <freetype/internal/t1types.h>
-
-#define FT_INTERNAL_POSTSCRIPT_AUX_H      <freetype/internal/psaux.h>
-#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <freetype/internal/pshints.h>
-#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <freetype/internal/psglobal.h>
-
-#define FT_INTERNAL_AUTOHINT_H            <freetype/internal/autohint.h>
+#define FT_INTERNAL_OBJECTS_H             <ftobjs.h>
+#define FT_INTERNAL_PIC_H                 <ftpic.h>
+#define FT_INTERNAL_STREAM_H              <ftstream.h>
+#define FT_INTERNAL_MEMORY_H              <ftmemory.h>
+#define FT_INTERNAL_DEBUG_H               <ftdebug.h>
+#define FT_INTERNAL_CALC_H                <ftcalc.h>
+#define FT_INTERNAL_DRIVER_H              <ftdriver.h>
+#define FT_INTERNAL_TRACE_H               <fttrace.h>
+#define FT_INTERNAL_GLYPH_LOADER_H        <ftgloadr.h>
+#define FT_INTERNAL_SFNT_H                <sfnt.h>
+#define FT_INTERNAL_SERVICE_H             <ftserv.h>
+#define FT_INTERNAL_RFORK_H               <ftrfork.h>
+#define FT_INTERNAL_VALIDATE_H            <ftvalid.h>
+
+#define FT_INTERNAL_TRUETYPE_TYPES_H      <tttypes.h>
+#define FT_INTERNAL_TYPE1_TYPES_H         <t1types.h>
+
+#define FT_INTERNAL_POSTSCRIPT_AUX_H      <psaux.h>
+#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <pshints.h>
+#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <psglobal.h>
+
+#define FT_INTERNAL_AUTOHINT_H            <autohint.h>
 
 
 /* END */
diff --git a/ios/lib/include/freetype/internal/psaux.h b/ios/lib/include/psaux.h
similarity index 100%
rename from ios/lib/include/freetype/internal/psaux.h
rename to ios/lib/include/psaux.h
diff --git a/ios/lib/include/freetype/internal/pshints.h b/ios/lib/include/pshints.h
similarity index 100%
rename from ios/lib/include/freetype/internal/pshints.h
rename to ios/lib/include/pshints.h
diff --git a/ios/lib/include/freetype/internal/sfnt.h b/ios/lib/include/sfnt.h
similarity index 100%
rename from ios/lib/include/freetype/internal/sfnt.h
rename to ios/lib/include/sfnt.h
diff --git a/ios/lib/include/freetype/internal/services/svbdf.h b/ios/lib/include/svbdf.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svbdf.h
rename to ios/lib/include/svbdf.h
diff --git a/ios/lib/include/freetype/internal/services/svcid.h b/ios/lib/include/svcid.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svcid.h
rename to ios/lib/include/svcid.h
diff --git a/ios/lib/include/freetype/internal/services/svgldict.h b/ios/lib/include/svgldict.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svgldict.h
rename to ios/lib/include/svgldict.h
diff --git a/ios/lib/include/freetype/internal/services/svgxval.h b/ios/lib/include/svgxval.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svgxval.h
rename to ios/lib/include/svgxval.h
diff --git a/ios/lib/include/freetype/internal/services/svkern.h b/ios/lib/include/svkern.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svkern.h
rename to ios/lib/include/svkern.h
diff --git a/ios/lib/include/freetype/internal/services/svmm.h b/ios/lib/include/svmm.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svmm.h
rename to ios/lib/include/svmm.h
diff --git a/ios/lib/include/freetype/internal/services/svotval.h b/ios/lib/include/svotval.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svotval.h
rename to ios/lib/include/svotval.h
diff --git a/ios/lib/include/freetype/internal/services/svpfr.h b/ios/lib/include/svpfr.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svpfr.h
rename to ios/lib/include/svpfr.h
diff --git a/ios/lib/include/freetype/internal/services/svpostnm.h b/ios/lib/include/svpostnm.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svpostnm.h
rename to ios/lib/include/svpostnm.h
diff --git a/ios/lib/include/freetype/internal/services/svprop.h b/ios/lib/include/svprop.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svprop.h
rename to ios/lib/include/svprop.h
diff --git a/ios/lib/include/freetype/internal/services/svpscmap.h b/ios/lib/include/svpscmap.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svpscmap.h
rename to ios/lib/include/svpscmap.h
diff --git a/ios/lib/include/freetype/internal/services/svpsinfo.h b/ios/lib/include/svpsinfo.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svpsinfo.h
rename to ios/lib/include/svpsinfo.h
diff --git a/ios/lib/include/freetype/internal/services/svsfnt.h b/ios/lib/include/svsfnt.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svsfnt.h
rename to ios/lib/include/svsfnt.h
diff --git a/ios/lib/include/freetype/internal/services/svttcmap.h b/ios/lib/include/svttcmap.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svttcmap.h
rename to ios/lib/include/svttcmap.h
diff --git a/ios/lib/include/freetype/internal/services/svtteng.h b/ios/lib/include/svtteng.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svtteng.h
rename to ios/lib/include/svtteng.h
diff --git a/ios/lib/include/freetype/internal/services/svttglyf.h b/ios/lib/include/svttglyf.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svttglyf.h
rename to ios/lib/include/svttglyf.h
diff --git a/ios/lib/include/freetype/internal/services/svwinfnt.h b/ios/lib/include/svwinfnt.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svwinfnt.h
rename to ios/lib/include/svwinfnt.h
diff --git a/ios/lib/include/freetype/internal/services/svxf86nm.h b/ios/lib/include/svxf86nm.h
similarity index 100%
rename from ios/lib/include/freetype/internal/services/svxf86nm.h
rename to ios/lib/include/svxf86nm.h
diff --git a/ios/lib/include/freetype/t1tables.h b/ios/lib/include/t1tables.h
similarity index 100%
rename from ios/lib/include/freetype/t1tables.h
rename to ios/lib/include/t1tables.h
diff --git a/ios/lib/include/freetype/internal/t1types.h b/ios/lib/include/t1types.h
similarity index 100%
rename from ios/lib/include/freetype/internal/t1types.h
rename to ios/lib/include/t1types.h
diff --git a/ios/lib/include/freetype/ttnameid.h b/ios/lib/include/ttnameid.h
similarity index 100%
rename from ios/lib/include/freetype/ttnameid.h
rename to ios/lib/include/ttnameid.h
diff --git a/ios/lib/include/freetype/tttables.h b/ios/lib/include/tttables.h
similarity index 100%
rename from ios/lib/include/freetype/tttables.h
rename to ios/lib/include/tttables.h
diff --git a/ios/lib/include/freetype/tttags.h b/ios/lib/include/tttags.h
similarity index 100%
rename from ios/lib/include/freetype/tttags.h
rename to ios/lib/include/tttags.h
diff --git a/ios/lib/include/freetype/internal/tttypes.h b/ios/lib/include/tttypes.h
similarity index 100%
rename from ios/lib/include/freetype/internal/tttypes.h
rename to ios/lib/include/tttypes.h
diff --git a/ios/lib/include/freetype/ttunpat.h b/ios/lib/include/ttunpat.h
similarity index 100%
rename from ios/lib/include/freetype/ttunpat.h
rename to ios/lib/include/ttunpat.h