diff --git a/GRRLIB/lib/freetype2/Makefile b/GRRLIB/lib/freetype/Makefile
similarity index 100%
rename from GRRLIB/lib/freetype2/Makefile
rename to GRRLIB/lib/freetype/Makefile
diff --git a/GRRLIB/lib/freetype2/builds/compiler/wii.mk b/GRRLIB/lib/freetype/builds/compiler/wii.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/builds/compiler/wii.mk
rename to GRRLIB/lib/freetype/builds/compiler/wii.mk
diff --git a/GRRLIB/lib/freetype2/builds/exports.mk b/GRRLIB/lib/freetype/builds/exports.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/builds/exports.mk
rename to GRRLIB/lib/freetype/builds/exports.mk
diff --git a/GRRLIB/lib/freetype2/builds/freetype.mk b/GRRLIB/lib/freetype/builds/freetype.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/builds/freetype.mk
rename to GRRLIB/lib/freetype/builds/freetype.mk
diff --git a/GRRLIB/lib/freetype2/builds/link_std.mk b/GRRLIB/lib/freetype/builds/link_std.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/builds/link_std.mk
rename to GRRLIB/lib/freetype/builds/link_std.mk
diff --git a/GRRLIB/lib/freetype2/builds/modules.mk b/GRRLIB/lib/freetype/builds/modules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/builds/modules.mk
rename to GRRLIB/lib/freetype/builds/modules.mk
diff --git a/GRRLIB/lib/freetype2/builds/toplevel.mk b/GRRLIB/lib/freetype/builds/toplevel.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/builds/toplevel.mk
rename to GRRLIB/lib/freetype/builds/toplevel.mk
diff --git a/GRRLIB/lib/freetype2/builds/wii/wii-def.mk b/GRRLIB/lib/freetype/builds/wii/wii-def.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/builds/wii/wii-def.mk
rename to GRRLIB/lib/freetype/builds/wii/wii-def.mk
diff --git a/GRRLIB/lib/freetype2/config.mk b/GRRLIB/lib/freetype/config.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/config.mk
rename to GRRLIB/lib/freetype/config.mk
diff --git a/GRRLIB/lib/freetype2/freetype.mk b/GRRLIB/lib/freetype/freetype.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/freetype.mk
rename to GRRLIB/lib/freetype/freetype.mk
diff --git a/GRRLIB/lib/freetype2/include/freetype/config/ftconfig.h b/GRRLIB/lib/freetype/include/freetype/config/ftconfig.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/config/ftconfig.h
rename to GRRLIB/lib/freetype/include/freetype/config/ftconfig.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/config/ftheader.h b/GRRLIB/lib/freetype/include/freetype/config/ftheader.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/config/ftheader.h
rename to GRRLIB/lib/freetype/include/freetype/config/ftheader.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/config/ftoption.h b/GRRLIB/lib/freetype/include/freetype/config/ftoption.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/config/ftoption.h
rename to GRRLIB/lib/freetype/include/freetype/config/ftoption.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/config/ftstdlib.h b/GRRLIB/lib/freetype/include/freetype/config/ftstdlib.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/config/ftstdlib.h
rename to GRRLIB/lib/freetype/include/freetype/config/ftstdlib.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/freetype.h b/GRRLIB/lib/freetype/include/freetype/freetype.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/freetype.h
rename to GRRLIB/lib/freetype/include/freetype/freetype.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftadvanc.h b/GRRLIB/lib/freetype/include/freetype/ftadvanc.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftadvanc.h
rename to GRRLIB/lib/freetype/include/freetype/ftadvanc.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftbbox.h b/GRRLIB/lib/freetype/include/freetype/ftbbox.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftbbox.h
rename to GRRLIB/lib/freetype/include/freetype/ftbbox.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftbdf.h b/GRRLIB/lib/freetype/include/freetype/ftbdf.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftbdf.h
rename to GRRLIB/lib/freetype/include/freetype/ftbdf.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftbitmap.h b/GRRLIB/lib/freetype/include/freetype/ftbitmap.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftbitmap.h
rename to GRRLIB/lib/freetype/include/freetype/ftbitmap.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftcache.h b/GRRLIB/lib/freetype/include/freetype/ftcache.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftcache.h
rename to GRRLIB/lib/freetype/include/freetype/ftcache.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftchapters.h b/GRRLIB/lib/freetype/include/freetype/ftchapters.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftchapters.h
rename to GRRLIB/lib/freetype/include/freetype/ftchapters.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftcid.h b/GRRLIB/lib/freetype/include/freetype/ftcid.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftcid.h
rename to GRRLIB/lib/freetype/include/freetype/ftcid.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/fterrdef.h b/GRRLIB/lib/freetype/include/freetype/fterrdef.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/fterrdef.h
rename to GRRLIB/lib/freetype/include/freetype/fterrdef.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/fterrors.h b/GRRLIB/lib/freetype/include/freetype/fterrors.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/fterrors.h
rename to GRRLIB/lib/freetype/include/freetype/fterrors.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftgasp.h b/GRRLIB/lib/freetype/include/freetype/ftgasp.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftgasp.h
rename to GRRLIB/lib/freetype/include/freetype/ftgasp.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftglyph.h b/GRRLIB/lib/freetype/include/freetype/ftglyph.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftglyph.h
rename to GRRLIB/lib/freetype/include/freetype/ftglyph.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftgxval.h b/GRRLIB/lib/freetype/include/freetype/ftgxval.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftgxval.h
rename to GRRLIB/lib/freetype/include/freetype/ftgxval.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftgzip.h b/GRRLIB/lib/freetype/include/freetype/ftgzip.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftgzip.h
rename to GRRLIB/lib/freetype/include/freetype/ftgzip.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftimage.h b/GRRLIB/lib/freetype/include/freetype/ftimage.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftimage.h
rename to GRRLIB/lib/freetype/include/freetype/ftimage.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftincrem.h b/GRRLIB/lib/freetype/include/freetype/ftincrem.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftincrem.h
rename to GRRLIB/lib/freetype/include/freetype/ftincrem.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftlcdfil.h b/GRRLIB/lib/freetype/include/freetype/ftlcdfil.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftlcdfil.h
rename to GRRLIB/lib/freetype/include/freetype/ftlcdfil.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftlist.h b/GRRLIB/lib/freetype/include/freetype/ftlist.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftlist.h
rename to GRRLIB/lib/freetype/include/freetype/ftlist.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftlzw.h b/GRRLIB/lib/freetype/include/freetype/ftlzw.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftlzw.h
rename to GRRLIB/lib/freetype/include/freetype/ftlzw.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftmac.h b/GRRLIB/lib/freetype/include/freetype/ftmac.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftmac.h
rename to GRRLIB/lib/freetype/include/freetype/ftmac.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftmm.h b/GRRLIB/lib/freetype/include/freetype/ftmm.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftmm.h
rename to GRRLIB/lib/freetype/include/freetype/ftmm.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftmodapi.h b/GRRLIB/lib/freetype/include/freetype/ftmodapi.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftmodapi.h
rename to GRRLIB/lib/freetype/include/freetype/ftmodapi.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftmoderr.h b/GRRLIB/lib/freetype/include/freetype/ftmoderr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftmoderr.h
rename to GRRLIB/lib/freetype/include/freetype/ftmoderr.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftotval.h b/GRRLIB/lib/freetype/include/freetype/ftotval.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftotval.h
rename to GRRLIB/lib/freetype/include/freetype/ftotval.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftoutln.h b/GRRLIB/lib/freetype/include/freetype/ftoutln.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftoutln.h
rename to GRRLIB/lib/freetype/include/freetype/ftoutln.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftpfr.h b/GRRLIB/lib/freetype/include/freetype/ftpfr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftpfr.h
rename to GRRLIB/lib/freetype/include/freetype/ftpfr.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftrender.h b/GRRLIB/lib/freetype/include/freetype/ftrender.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftrender.h
rename to GRRLIB/lib/freetype/include/freetype/ftrender.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftsizes.h b/GRRLIB/lib/freetype/include/freetype/ftsizes.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftsizes.h
rename to GRRLIB/lib/freetype/include/freetype/ftsizes.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftsnames.h b/GRRLIB/lib/freetype/include/freetype/ftsnames.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftsnames.h
rename to GRRLIB/lib/freetype/include/freetype/ftsnames.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftstroke.h b/GRRLIB/lib/freetype/include/freetype/ftstroke.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftstroke.h
rename to GRRLIB/lib/freetype/include/freetype/ftstroke.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftsynth.h b/GRRLIB/lib/freetype/include/freetype/ftsynth.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftsynth.h
rename to GRRLIB/lib/freetype/include/freetype/ftsynth.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftsystem.h b/GRRLIB/lib/freetype/include/freetype/ftsystem.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftsystem.h
rename to GRRLIB/lib/freetype/include/freetype/ftsystem.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/fttrigon.h b/GRRLIB/lib/freetype/include/freetype/fttrigon.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/fttrigon.h
rename to GRRLIB/lib/freetype/include/freetype/fttrigon.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/fttypes.h b/GRRLIB/lib/freetype/include/freetype/fttypes.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/fttypes.h
rename to GRRLIB/lib/freetype/include/freetype/fttypes.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftwinfnt.h b/GRRLIB/lib/freetype/include/freetype/ftwinfnt.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftwinfnt.h
rename to GRRLIB/lib/freetype/include/freetype/ftwinfnt.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ftxf86.h b/GRRLIB/lib/freetype/include/freetype/ftxf86.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ftxf86.h
rename to GRRLIB/lib/freetype/include/freetype/ftxf86.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/autohint.h b/GRRLIB/lib/freetype/include/freetype/internal/autohint.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/autohint.h
rename to GRRLIB/lib/freetype/include/freetype/internal/autohint.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftcalc.h b/GRRLIB/lib/freetype/include/freetype/internal/ftcalc.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftcalc.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftcalc.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftdebug.h b/GRRLIB/lib/freetype/include/freetype/internal/ftdebug.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftdebug.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftdebug.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftdriver.h b/GRRLIB/lib/freetype/include/freetype/internal/ftdriver.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftdriver.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftdriver.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftgloadr.h b/GRRLIB/lib/freetype/include/freetype/internal/ftgloadr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftgloadr.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftgloadr.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftmemory.h b/GRRLIB/lib/freetype/include/freetype/internal/ftmemory.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftmemory.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftmemory.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftobjs.h b/GRRLIB/lib/freetype/include/freetype/internal/ftobjs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftobjs.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftobjs.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftpic.h b/GRRLIB/lib/freetype/include/freetype/internal/ftpic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftpic.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftpic.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftrfork.h b/GRRLIB/lib/freetype/include/freetype/internal/ftrfork.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftrfork.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftrfork.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftserv.h b/GRRLIB/lib/freetype/include/freetype/internal/ftserv.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftserv.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftserv.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftstream.h b/GRRLIB/lib/freetype/include/freetype/internal/ftstream.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftstream.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftstream.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/fttrace.h b/GRRLIB/lib/freetype/include/freetype/internal/fttrace.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/fttrace.h
rename to GRRLIB/lib/freetype/include/freetype/internal/fttrace.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/ftvalid.h b/GRRLIB/lib/freetype/include/freetype/internal/ftvalid.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/ftvalid.h
rename to GRRLIB/lib/freetype/include/freetype/internal/ftvalid.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/internal.h b/GRRLIB/lib/freetype/include/freetype/internal/internal.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/internal.h
rename to GRRLIB/lib/freetype/include/freetype/internal/internal.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/pcftypes.h b/GRRLIB/lib/freetype/include/freetype/internal/pcftypes.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/pcftypes.h
rename to GRRLIB/lib/freetype/include/freetype/internal/pcftypes.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/psaux.h b/GRRLIB/lib/freetype/include/freetype/internal/psaux.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/psaux.h
rename to GRRLIB/lib/freetype/include/freetype/internal/psaux.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/pshints.h b/GRRLIB/lib/freetype/include/freetype/internal/pshints.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/pshints.h
rename to GRRLIB/lib/freetype/include/freetype/internal/pshints.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svbdf.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svbdf.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svbdf.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svbdf.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svcid.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svcid.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svcid.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svcid.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svgldict.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svgldict.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svgldict.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svgldict.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svgxval.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svgxval.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svgxval.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svgxval.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svkern.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svkern.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svkern.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svkern.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svmm.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svmm.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svmm.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svmm.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svotval.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svotval.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svotval.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svotval.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svpfr.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svpfr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svpfr.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svpfr.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svpostnm.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svpostnm.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svpostnm.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svpostnm.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svpscmap.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svpscmap.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svpscmap.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svpscmap.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svpsinfo.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svpsinfo.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svpsinfo.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svpsinfo.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svsfnt.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svsfnt.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svsfnt.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svsfnt.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svttcmap.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svttcmap.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svttcmap.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svttcmap.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svtteng.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svtteng.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svtteng.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svtteng.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svttglyf.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svttglyf.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svttglyf.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svttglyf.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svwinfnt.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svwinfnt.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svwinfnt.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svwinfnt.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/services/svxf86nm.h b/GRRLIB/lib/freetype/include/freetype/internal/services/svxf86nm.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/services/svxf86nm.h
rename to GRRLIB/lib/freetype/include/freetype/internal/services/svxf86nm.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/sfnt.h b/GRRLIB/lib/freetype/include/freetype/internal/sfnt.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/sfnt.h
rename to GRRLIB/lib/freetype/include/freetype/internal/sfnt.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/t1types.h b/GRRLIB/lib/freetype/include/freetype/internal/t1types.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/t1types.h
rename to GRRLIB/lib/freetype/include/freetype/internal/t1types.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/internal/tttypes.h b/GRRLIB/lib/freetype/include/freetype/internal/tttypes.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/internal/tttypes.h
rename to GRRLIB/lib/freetype/include/freetype/internal/tttypes.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/t1tables.h b/GRRLIB/lib/freetype/include/freetype/t1tables.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/t1tables.h
rename to GRRLIB/lib/freetype/include/freetype/t1tables.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ttnameid.h b/GRRLIB/lib/freetype/include/freetype/ttnameid.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ttnameid.h
rename to GRRLIB/lib/freetype/include/freetype/ttnameid.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/tttables.h b/GRRLIB/lib/freetype/include/freetype/tttables.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/tttables.h
rename to GRRLIB/lib/freetype/include/freetype/tttables.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/tttags.h b/GRRLIB/lib/freetype/include/freetype/tttags.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/tttags.h
rename to GRRLIB/lib/freetype/include/freetype/tttags.h
diff --git a/GRRLIB/lib/freetype2/include/freetype/ttunpat.h b/GRRLIB/lib/freetype/include/freetype/ttunpat.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/freetype/ttunpat.h
rename to GRRLIB/lib/freetype/include/freetype/ttunpat.h
diff --git a/GRRLIB/lib/freetype2/include/ft2build.h b/GRRLIB/lib/freetype/include/ft2build.h
similarity index 100%
rename from GRRLIB/lib/freetype2/include/ft2build.h
rename to GRRLIB/lib/freetype/include/ft2build.h
diff --git a/GRRLIB/lib/freetype2/modules.cfg b/GRRLIB/lib/freetype/modules.cfg
similarity index 100%
rename from GRRLIB/lib/freetype2/modules.cfg
rename to GRRLIB/lib/freetype/modules.cfg
diff --git a/GRRLIB/lib/freetype2/src/autofit/afangles.c b/GRRLIB/lib/freetype/src/autofit/afangles.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afangles.c
rename to GRRLIB/lib/freetype/src/autofit/afangles.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afangles.h b/GRRLIB/lib/freetype/src/autofit/afangles.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afangles.h
rename to GRRLIB/lib/freetype/src/autofit/afangles.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afcjk.c b/GRRLIB/lib/freetype/src/autofit/afcjk.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afcjk.c
rename to GRRLIB/lib/freetype/src/autofit/afcjk.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afcjk.h b/GRRLIB/lib/freetype/src/autofit/afcjk.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afcjk.h
rename to GRRLIB/lib/freetype/src/autofit/afcjk.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afdummy.c b/GRRLIB/lib/freetype/src/autofit/afdummy.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afdummy.c
rename to GRRLIB/lib/freetype/src/autofit/afdummy.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afdummy.h b/GRRLIB/lib/freetype/src/autofit/afdummy.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afdummy.h
rename to GRRLIB/lib/freetype/src/autofit/afdummy.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/aferrors.h b/GRRLIB/lib/freetype/src/autofit/aferrors.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/aferrors.h
rename to GRRLIB/lib/freetype/src/autofit/aferrors.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afglobal.c b/GRRLIB/lib/freetype/src/autofit/afglobal.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afglobal.c
rename to GRRLIB/lib/freetype/src/autofit/afglobal.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afglobal.h b/GRRLIB/lib/freetype/src/autofit/afglobal.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afglobal.h
rename to GRRLIB/lib/freetype/src/autofit/afglobal.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afhints.c b/GRRLIB/lib/freetype/src/autofit/afhints.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afhints.c
rename to GRRLIB/lib/freetype/src/autofit/afhints.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afhints.h b/GRRLIB/lib/freetype/src/autofit/afhints.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afhints.h
rename to GRRLIB/lib/freetype/src/autofit/afhints.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afindic.c b/GRRLIB/lib/freetype/src/autofit/afindic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afindic.c
rename to GRRLIB/lib/freetype/src/autofit/afindic.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afindic.h b/GRRLIB/lib/freetype/src/autofit/afindic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afindic.h
rename to GRRLIB/lib/freetype/src/autofit/afindic.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/aflatin.c b/GRRLIB/lib/freetype/src/autofit/aflatin.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/aflatin.c
rename to GRRLIB/lib/freetype/src/autofit/aflatin.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/aflatin.h b/GRRLIB/lib/freetype/src/autofit/aflatin.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/aflatin.h
rename to GRRLIB/lib/freetype/src/autofit/aflatin.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/aflatin2.c b/GRRLIB/lib/freetype/src/autofit/aflatin2.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/aflatin2.c
rename to GRRLIB/lib/freetype/src/autofit/aflatin2.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/aflatin2.h b/GRRLIB/lib/freetype/src/autofit/aflatin2.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/aflatin2.h
rename to GRRLIB/lib/freetype/src/autofit/aflatin2.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afloader.c b/GRRLIB/lib/freetype/src/autofit/afloader.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afloader.c
rename to GRRLIB/lib/freetype/src/autofit/afloader.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afloader.h b/GRRLIB/lib/freetype/src/autofit/afloader.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afloader.h
rename to GRRLIB/lib/freetype/src/autofit/afloader.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afmodule.c b/GRRLIB/lib/freetype/src/autofit/afmodule.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afmodule.c
rename to GRRLIB/lib/freetype/src/autofit/afmodule.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afmodule.h b/GRRLIB/lib/freetype/src/autofit/afmodule.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afmodule.h
rename to GRRLIB/lib/freetype/src/autofit/afmodule.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afpic.c b/GRRLIB/lib/freetype/src/autofit/afpic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afpic.c
rename to GRRLIB/lib/freetype/src/autofit/afpic.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afpic.h b/GRRLIB/lib/freetype/src/autofit/afpic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afpic.h
rename to GRRLIB/lib/freetype/src/autofit/afpic.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/aftypes.h b/GRRLIB/lib/freetype/src/autofit/aftypes.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/aftypes.h
rename to GRRLIB/lib/freetype/src/autofit/aftypes.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/afwarp.c b/GRRLIB/lib/freetype/src/autofit/afwarp.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afwarp.c
rename to GRRLIB/lib/freetype/src/autofit/afwarp.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/afwarp.h b/GRRLIB/lib/freetype/src/autofit/afwarp.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/afwarp.h
rename to GRRLIB/lib/freetype/src/autofit/afwarp.h
diff --git a/GRRLIB/lib/freetype2/src/autofit/autofit.c b/GRRLIB/lib/freetype/src/autofit/autofit.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/autofit.c
rename to GRRLIB/lib/freetype/src/autofit/autofit.c
diff --git a/GRRLIB/lib/freetype2/src/autofit/module.mk b/GRRLIB/lib/freetype/src/autofit/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/module.mk
rename to GRRLIB/lib/freetype/src/autofit/module.mk
diff --git a/GRRLIB/lib/freetype2/src/autofit/rules.mk b/GRRLIB/lib/freetype/src/autofit/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/autofit/rules.mk
rename to GRRLIB/lib/freetype/src/autofit/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/base/basepic.c b/GRRLIB/lib/freetype/src/base/basepic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/basepic.c
rename to GRRLIB/lib/freetype/src/base/basepic.c
diff --git a/GRRLIB/lib/freetype2/src/base/basepic.h b/GRRLIB/lib/freetype/src/base/basepic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/basepic.h
rename to GRRLIB/lib/freetype/src/base/basepic.h
diff --git a/GRRLIB/lib/freetype2/src/base/ftadvanc.c b/GRRLIB/lib/freetype/src/base/ftadvanc.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftadvanc.c
rename to GRRLIB/lib/freetype/src/base/ftadvanc.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftapi.c b/GRRLIB/lib/freetype/src/base/ftapi.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftapi.c
rename to GRRLIB/lib/freetype/src/base/ftapi.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftbase.c b/GRRLIB/lib/freetype/src/base/ftbase.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftbase.c
rename to GRRLIB/lib/freetype/src/base/ftbase.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftbase.h b/GRRLIB/lib/freetype/src/base/ftbase.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftbase.h
rename to GRRLIB/lib/freetype/src/base/ftbase.h
diff --git a/GRRLIB/lib/freetype2/src/base/ftbbox.c b/GRRLIB/lib/freetype/src/base/ftbbox.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftbbox.c
rename to GRRLIB/lib/freetype/src/base/ftbbox.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftbdf.c b/GRRLIB/lib/freetype/src/base/ftbdf.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftbdf.c
rename to GRRLIB/lib/freetype/src/base/ftbdf.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftbitmap.c b/GRRLIB/lib/freetype/src/base/ftbitmap.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftbitmap.c
rename to GRRLIB/lib/freetype/src/base/ftbitmap.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftcalc.c b/GRRLIB/lib/freetype/src/base/ftcalc.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftcalc.c
rename to GRRLIB/lib/freetype/src/base/ftcalc.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftcid.c b/GRRLIB/lib/freetype/src/base/ftcid.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftcid.c
rename to GRRLIB/lib/freetype/src/base/ftcid.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftdbgmem.c b/GRRLIB/lib/freetype/src/base/ftdbgmem.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftdbgmem.c
rename to GRRLIB/lib/freetype/src/base/ftdbgmem.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftdebug.c b/GRRLIB/lib/freetype/src/base/ftdebug.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftdebug.c
rename to GRRLIB/lib/freetype/src/base/ftdebug.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftfstype.c b/GRRLIB/lib/freetype/src/base/ftfstype.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftfstype.c
rename to GRRLIB/lib/freetype/src/base/ftfstype.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftgasp.c b/GRRLIB/lib/freetype/src/base/ftgasp.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftgasp.c
rename to GRRLIB/lib/freetype/src/base/ftgasp.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftgloadr.c b/GRRLIB/lib/freetype/src/base/ftgloadr.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftgloadr.c
rename to GRRLIB/lib/freetype/src/base/ftgloadr.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftglyph.c b/GRRLIB/lib/freetype/src/base/ftglyph.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftglyph.c
rename to GRRLIB/lib/freetype/src/base/ftglyph.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftgxval.c b/GRRLIB/lib/freetype/src/base/ftgxval.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftgxval.c
rename to GRRLIB/lib/freetype/src/base/ftgxval.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftinit.c b/GRRLIB/lib/freetype/src/base/ftinit.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftinit.c
rename to GRRLIB/lib/freetype/src/base/ftinit.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftlcdfil.c b/GRRLIB/lib/freetype/src/base/ftlcdfil.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftlcdfil.c
rename to GRRLIB/lib/freetype/src/base/ftlcdfil.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftmac.c b/GRRLIB/lib/freetype/src/base/ftmac.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftmac.c
rename to GRRLIB/lib/freetype/src/base/ftmac.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftmm.c b/GRRLIB/lib/freetype/src/base/ftmm.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftmm.c
rename to GRRLIB/lib/freetype/src/base/ftmm.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftobjs.c b/GRRLIB/lib/freetype/src/base/ftobjs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftobjs.c
rename to GRRLIB/lib/freetype/src/base/ftobjs.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftotval.c b/GRRLIB/lib/freetype/src/base/ftotval.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftotval.c
rename to GRRLIB/lib/freetype/src/base/ftotval.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftoutln.c b/GRRLIB/lib/freetype/src/base/ftoutln.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftoutln.c
rename to GRRLIB/lib/freetype/src/base/ftoutln.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftpatent.c b/GRRLIB/lib/freetype/src/base/ftpatent.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftpatent.c
rename to GRRLIB/lib/freetype/src/base/ftpatent.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftpfr.c b/GRRLIB/lib/freetype/src/base/ftpfr.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftpfr.c
rename to GRRLIB/lib/freetype/src/base/ftpfr.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftpic.c b/GRRLIB/lib/freetype/src/base/ftpic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftpic.c
rename to GRRLIB/lib/freetype/src/base/ftpic.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftrfork.c b/GRRLIB/lib/freetype/src/base/ftrfork.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftrfork.c
rename to GRRLIB/lib/freetype/src/base/ftrfork.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftsnames.c b/GRRLIB/lib/freetype/src/base/ftsnames.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftsnames.c
rename to GRRLIB/lib/freetype/src/base/ftsnames.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftstream.c b/GRRLIB/lib/freetype/src/base/ftstream.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftstream.c
rename to GRRLIB/lib/freetype/src/base/ftstream.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftstroke.c b/GRRLIB/lib/freetype/src/base/ftstroke.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftstroke.c
rename to GRRLIB/lib/freetype/src/base/ftstroke.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftsynth.c b/GRRLIB/lib/freetype/src/base/ftsynth.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftsynth.c
rename to GRRLIB/lib/freetype/src/base/ftsynth.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftsystem.c b/GRRLIB/lib/freetype/src/base/ftsystem.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftsystem.c
rename to GRRLIB/lib/freetype/src/base/ftsystem.c
diff --git a/GRRLIB/lib/freetype2/src/base/fttrigon.c b/GRRLIB/lib/freetype/src/base/fttrigon.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/fttrigon.c
rename to GRRLIB/lib/freetype/src/base/fttrigon.c
diff --git a/GRRLIB/lib/freetype2/src/base/fttype1.c b/GRRLIB/lib/freetype/src/base/fttype1.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/fttype1.c
rename to GRRLIB/lib/freetype/src/base/fttype1.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftutil.c b/GRRLIB/lib/freetype/src/base/ftutil.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftutil.c
rename to GRRLIB/lib/freetype/src/base/ftutil.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftwinfnt.c b/GRRLIB/lib/freetype/src/base/ftwinfnt.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftwinfnt.c
rename to GRRLIB/lib/freetype/src/base/ftwinfnt.c
diff --git a/GRRLIB/lib/freetype2/src/base/ftxf86.c b/GRRLIB/lib/freetype/src/base/ftxf86.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/ftxf86.c
rename to GRRLIB/lib/freetype/src/base/ftxf86.c
diff --git a/GRRLIB/lib/freetype2/src/base/rules.mk b/GRRLIB/lib/freetype/src/base/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/base/rules.mk
rename to GRRLIB/lib/freetype/src/base/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/bdf/README b/GRRLIB/lib/freetype/src/bdf/README
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/README
rename to GRRLIB/lib/freetype/src/bdf/README
diff --git a/GRRLIB/lib/freetype2/src/bdf/bdf.c b/GRRLIB/lib/freetype/src/bdf/bdf.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/bdf.c
rename to GRRLIB/lib/freetype/src/bdf/bdf.c
diff --git a/GRRLIB/lib/freetype2/src/bdf/bdf.h b/GRRLIB/lib/freetype/src/bdf/bdf.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/bdf.h
rename to GRRLIB/lib/freetype/src/bdf/bdf.h
diff --git a/GRRLIB/lib/freetype2/src/bdf/bdfdrivr.c b/GRRLIB/lib/freetype/src/bdf/bdfdrivr.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/bdfdrivr.c
rename to GRRLIB/lib/freetype/src/bdf/bdfdrivr.c
diff --git a/GRRLIB/lib/freetype2/src/bdf/bdfdrivr.h b/GRRLIB/lib/freetype/src/bdf/bdfdrivr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/bdfdrivr.h
rename to GRRLIB/lib/freetype/src/bdf/bdfdrivr.h
diff --git a/GRRLIB/lib/freetype2/src/bdf/bdferror.h b/GRRLIB/lib/freetype/src/bdf/bdferror.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/bdferror.h
rename to GRRLIB/lib/freetype/src/bdf/bdferror.h
diff --git a/GRRLIB/lib/freetype2/src/bdf/bdflib.c b/GRRLIB/lib/freetype/src/bdf/bdflib.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/bdflib.c
rename to GRRLIB/lib/freetype/src/bdf/bdflib.c
diff --git a/GRRLIB/lib/freetype2/src/bdf/module.mk b/GRRLIB/lib/freetype/src/bdf/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/module.mk
rename to GRRLIB/lib/freetype/src/bdf/module.mk
diff --git a/GRRLIB/lib/freetype2/src/bdf/rules.mk b/GRRLIB/lib/freetype/src/bdf/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/bdf/rules.mk
rename to GRRLIB/lib/freetype/src/bdf/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcache.c b/GRRLIB/lib/freetype/src/cache/ftcache.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcache.c
rename to GRRLIB/lib/freetype/src/cache/ftcache.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcbasic.c b/GRRLIB/lib/freetype/src/cache/ftcbasic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcbasic.c
rename to GRRLIB/lib/freetype/src/cache/ftcbasic.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftccache.c b/GRRLIB/lib/freetype/src/cache/ftccache.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftccache.c
rename to GRRLIB/lib/freetype/src/cache/ftccache.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftccache.h b/GRRLIB/lib/freetype/src/cache/ftccache.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftccache.h
rename to GRRLIB/lib/freetype/src/cache/ftccache.h
diff --git a/GRRLIB/lib/freetype2/src/cache/ftccback.h b/GRRLIB/lib/freetype/src/cache/ftccback.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftccback.h
rename to GRRLIB/lib/freetype/src/cache/ftccback.h
diff --git a/GRRLIB/lib/freetype2/src/cache/ftccmap.c b/GRRLIB/lib/freetype/src/cache/ftccmap.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftccmap.c
rename to GRRLIB/lib/freetype/src/cache/ftccmap.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcerror.h b/GRRLIB/lib/freetype/src/cache/ftcerror.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcerror.h
rename to GRRLIB/lib/freetype/src/cache/ftcerror.h
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcglyph.c b/GRRLIB/lib/freetype/src/cache/ftcglyph.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcglyph.c
rename to GRRLIB/lib/freetype/src/cache/ftcglyph.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcglyph.h b/GRRLIB/lib/freetype/src/cache/ftcglyph.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcglyph.h
rename to GRRLIB/lib/freetype/src/cache/ftcglyph.h
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcimage.c b/GRRLIB/lib/freetype/src/cache/ftcimage.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcimage.c
rename to GRRLIB/lib/freetype/src/cache/ftcimage.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcimage.h b/GRRLIB/lib/freetype/src/cache/ftcimage.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcimage.h
rename to GRRLIB/lib/freetype/src/cache/ftcimage.h
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcmanag.c b/GRRLIB/lib/freetype/src/cache/ftcmanag.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcmanag.c
rename to GRRLIB/lib/freetype/src/cache/ftcmanag.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcmanag.h b/GRRLIB/lib/freetype/src/cache/ftcmanag.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcmanag.h
rename to GRRLIB/lib/freetype/src/cache/ftcmanag.h
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcmru.c b/GRRLIB/lib/freetype/src/cache/ftcmru.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcmru.c
rename to GRRLIB/lib/freetype/src/cache/ftcmru.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcmru.h b/GRRLIB/lib/freetype/src/cache/ftcmru.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcmru.h
rename to GRRLIB/lib/freetype/src/cache/ftcmru.h
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcsbits.c b/GRRLIB/lib/freetype/src/cache/ftcsbits.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcsbits.c
rename to GRRLIB/lib/freetype/src/cache/ftcsbits.c
diff --git a/GRRLIB/lib/freetype2/src/cache/ftcsbits.h b/GRRLIB/lib/freetype/src/cache/ftcsbits.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/ftcsbits.h
rename to GRRLIB/lib/freetype/src/cache/ftcsbits.h
diff --git a/GRRLIB/lib/freetype2/src/cache/rules.mk b/GRRLIB/lib/freetype/src/cache/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cache/rules.mk
rename to GRRLIB/lib/freetype/src/cache/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/cff/cff.c b/GRRLIB/lib/freetype/src/cff/cff.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cff.c
rename to GRRLIB/lib/freetype/src/cff/cff.c
diff --git a/GRRLIB/lib/freetype2/src/cff/cffcmap.c b/GRRLIB/lib/freetype/src/cff/cffcmap.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffcmap.c
rename to GRRLIB/lib/freetype/src/cff/cffcmap.c
diff --git a/GRRLIB/lib/freetype2/src/cff/cffcmap.h b/GRRLIB/lib/freetype/src/cff/cffcmap.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffcmap.h
rename to GRRLIB/lib/freetype/src/cff/cffcmap.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cffdrivr.c b/GRRLIB/lib/freetype/src/cff/cffdrivr.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffdrivr.c
rename to GRRLIB/lib/freetype/src/cff/cffdrivr.c
diff --git a/GRRLIB/lib/freetype2/src/cff/cffdrivr.h b/GRRLIB/lib/freetype/src/cff/cffdrivr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffdrivr.h
rename to GRRLIB/lib/freetype/src/cff/cffdrivr.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cfferrs.h b/GRRLIB/lib/freetype/src/cff/cfferrs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cfferrs.h
rename to GRRLIB/lib/freetype/src/cff/cfferrs.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cffgload.c b/GRRLIB/lib/freetype/src/cff/cffgload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffgload.c
rename to GRRLIB/lib/freetype/src/cff/cffgload.c
diff --git a/GRRLIB/lib/freetype2/src/cff/cffgload.h b/GRRLIB/lib/freetype/src/cff/cffgload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffgload.h
rename to GRRLIB/lib/freetype/src/cff/cffgload.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cffload.c b/GRRLIB/lib/freetype/src/cff/cffload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffload.c
rename to GRRLIB/lib/freetype/src/cff/cffload.c
diff --git a/GRRLIB/lib/freetype2/src/cff/cffload.h b/GRRLIB/lib/freetype/src/cff/cffload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffload.h
rename to GRRLIB/lib/freetype/src/cff/cffload.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cffobjs.c b/GRRLIB/lib/freetype/src/cff/cffobjs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffobjs.c
rename to GRRLIB/lib/freetype/src/cff/cffobjs.c
diff --git a/GRRLIB/lib/freetype2/src/cff/cffobjs.h b/GRRLIB/lib/freetype/src/cff/cffobjs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffobjs.h
rename to GRRLIB/lib/freetype/src/cff/cffobjs.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cffparse.c b/GRRLIB/lib/freetype/src/cff/cffparse.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffparse.c
rename to GRRLIB/lib/freetype/src/cff/cffparse.c
diff --git a/GRRLIB/lib/freetype2/src/cff/cffparse.h b/GRRLIB/lib/freetype/src/cff/cffparse.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffparse.h
rename to GRRLIB/lib/freetype/src/cff/cffparse.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cffpic.c b/GRRLIB/lib/freetype/src/cff/cffpic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffpic.c
rename to GRRLIB/lib/freetype/src/cff/cffpic.c
diff --git a/GRRLIB/lib/freetype2/src/cff/cffpic.h b/GRRLIB/lib/freetype/src/cff/cffpic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cffpic.h
rename to GRRLIB/lib/freetype/src/cff/cffpic.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cfftoken.h b/GRRLIB/lib/freetype/src/cff/cfftoken.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cfftoken.h
rename to GRRLIB/lib/freetype/src/cff/cfftoken.h
diff --git a/GRRLIB/lib/freetype2/src/cff/cfftypes.h b/GRRLIB/lib/freetype/src/cff/cfftypes.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/cfftypes.h
rename to GRRLIB/lib/freetype/src/cff/cfftypes.h
diff --git a/GRRLIB/lib/freetype2/src/cff/module.mk b/GRRLIB/lib/freetype/src/cff/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/module.mk
rename to GRRLIB/lib/freetype/src/cff/module.mk
diff --git a/GRRLIB/lib/freetype2/src/cff/rules.mk b/GRRLIB/lib/freetype/src/cff/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cff/rules.mk
rename to GRRLIB/lib/freetype/src/cff/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/cid/ciderrs.h b/GRRLIB/lib/freetype/src/cid/ciderrs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/ciderrs.h
rename to GRRLIB/lib/freetype/src/cid/ciderrs.h
diff --git a/GRRLIB/lib/freetype2/src/cid/cidgload.c b/GRRLIB/lib/freetype/src/cid/cidgload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidgload.c
rename to GRRLIB/lib/freetype/src/cid/cidgload.c
diff --git a/GRRLIB/lib/freetype2/src/cid/cidgload.h b/GRRLIB/lib/freetype/src/cid/cidgload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidgload.h
rename to GRRLIB/lib/freetype/src/cid/cidgload.h
diff --git a/GRRLIB/lib/freetype2/src/cid/cidload.c b/GRRLIB/lib/freetype/src/cid/cidload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidload.c
rename to GRRLIB/lib/freetype/src/cid/cidload.c
diff --git a/GRRLIB/lib/freetype2/src/cid/cidload.h b/GRRLIB/lib/freetype/src/cid/cidload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidload.h
rename to GRRLIB/lib/freetype/src/cid/cidload.h
diff --git a/GRRLIB/lib/freetype2/src/cid/cidobjs.c b/GRRLIB/lib/freetype/src/cid/cidobjs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidobjs.c
rename to GRRLIB/lib/freetype/src/cid/cidobjs.c
diff --git a/GRRLIB/lib/freetype2/src/cid/cidobjs.h b/GRRLIB/lib/freetype/src/cid/cidobjs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidobjs.h
rename to GRRLIB/lib/freetype/src/cid/cidobjs.h
diff --git a/GRRLIB/lib/freetype2/src/cid/cidparse.c b/GRRLIB/lib/freetype/src/cid/cidparse.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidparse.c
rename to GRRLIB/lib/freetype/src/cid/cidparse.c
diff --git a/GRRLIB/lib/freetype2/src/cid/cidparse.h b/GRRLIB/lib/freetype/src/cid/cidparse.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidparse.h
rename to GRRLIB/lib/freetype/src/cid/cidparse.h
diff --git a/GRRLIB/lib/freetype2/src/cid/cidriver.c b/GRRLIB/lib/freetype/src/cid/cidriver.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidriver.c
rename to GRRLIB/lib/freetype/src/cid/cidriver.c
diff --git a/GRRLIB/lib/freetype2/src/cid/cidriver.h b/GRRLIB/lib/freetype/src/cid/cidriver.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidriver.h
rename to GRRLIB/lib/freetype/src/cid/cidriver.h
diff --git a/GRRLIB/lib/freetype2/src/cid/cidtoken.h b/GRRLIB/lib/freetype/src/cid/cidtoken.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/cidtoken.h
rename to GRRLIB/lib/freetype/src/cid/cidtoken.h
diff --git a/GRRLIB/lib/freetype2/src/cid/module.mk b/GRRLIB/lib/freetype/src/cid/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/module.mk
rename to GRRLIB/lib/freetype/src/cid/module.mk
diff --git a/GRRLIB/lib/freetype2/src/cid/rules.mk b/GRRLIB/lib/freetype/src/cid/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/rules.mk
rename to GRRLIB/lib/freetype/src/cid/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/cid/type1cid.c b/GRRLIB/lib/freetype/src/cid/type1cid.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/cid/type1cid.c
rename to GRRLIB/lib/freetype/src/cid/type1cid.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/README b/GRRLIB/lib/freetype/src/gxvalid/README
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/README
rename to GRRLIB/lib/freetype/src/gxvalid/README
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvalid.c b/GRRLIB/lib/freetype/src/gxvalid/gxvalid.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvalid.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvalid.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvalid.h b/GRRLIB/lib/freetype/src/gxvalid/gxvalid.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvalid.h
rename to GRRLIB/lib/freetype/src/gxvalid/gxvalid.h
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvbsln.c b/GRRLIB/lib/freetype/src/gxvalid/gxvbsln.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvbsln.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvbsln.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvcommn.c b/GRRLIB/lib/freetype/src/gxvalid/gxvcommn.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvcommn.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvcommn.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvcommn.h b/GRRLIB/lib/freetype/src/gxvalid/gxvcommn.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvcommn.h
rename to GRRLIB/lib/freetype/src/gxvalid/gxvcommn.h
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxverror.h b/GRRLIB/lib/freetype/src/gxvalid/gxverror.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxverror.h
rename to GRRLIB/lib/freetype/src/gxvalid/gxverror.h
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvfeat.c b/GRRLIB/lib/freetype/src/gxvalid/gxvfeat.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvfeat.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvfeat.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvfeat.h b/GRRLIB/lib/freetype/src/gxvalid/gxvfeat.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvfeat.h
rename to GRRLIB/lib/freetype/src/gxvalid/gxvfeat.h
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvfgen.c b/GRRLIB/lib/freetype/src/gxvalid/gxvfgen.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvfgen.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvfgen.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvjust.c b/GRRLIB/lib/freetype/src/gxvalid/gxvjust.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvjust.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvjust.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvkern.c b/GRRLIB/lib/freetype/src/gxvalid/gxvkern.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvkern.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvkern.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvlcar.c b/GRRLIB/lib/freetype/src/gxvalid/gxvlcar.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvlcar.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvlcar.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmod.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmod.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmod.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmod.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmod.h b/GRRLIB/lib/freetype/src/gxvalid/gxvmod.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmod.h
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmod.h
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmort.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmort.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmort.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmort.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmort.h b/GRRLIB/lib/freetype/src/gxvalid/gxvmort.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmort.h
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmort.h
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmort0.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmort0.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmort0.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmort0.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmort1.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmort1.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmort1.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmort1.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmort2.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmort2.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmort2.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmort2.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmort4.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmort4.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmort4.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmort4.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmort5.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmort5.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmort5.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmort5.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmorx.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmorx.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmorx.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmorx.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmorx.h b/GRRLIB/lib/freetype/src/gxvalid/gxvmorx.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmorx.h
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmorx.h
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmorx0.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmorx0.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmorx0.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmorx0.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmorx1.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmorx1.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmorx1.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmorx1.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmorx2.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmorx2.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmorx2.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmorx2.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmorx4.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmorx4.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmorx4.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmorx4.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvmorx5.c b/GRRLIB/lib/freetype/src/gxvalid/gxvmorx5.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvmorx5.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvmorx5.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvopbd.c b/GRRLIB/lib/freetype/src/gxvalid/gxvopbd.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvopbd.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvopbd.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvprop.c b/GRRLIB/lib/freetype/src/gxvalid/gxvprop.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvprop.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvprop.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/gxvtrak.c b/GRRLIB/lib/freetype/src/gxvalid/gxvtrak.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/gxvtrak.c
rename to GRRLIB/lib/freetype/src/gxvalid/gxvtrak.c
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/module.mk b/GRRLIB/lib/freetype/src/gxvalid/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/module.mk
rename to GRRLIB/lib/freetype/src/gxvalid/module.mk
diff --git a/GRRLIB/lib/freetype2/src/gxvalid/rules.mk b/GRRLIB/lib/freetype/src/gxvalid/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gxvalid/rules.mk
rename to GRRLIB/lib/freetype/src/gxvalid/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/gzip/adler32.c b/GRRLIB/lib/freetype/src/gzip/adler32.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/adler32.c
rename to GRRLIB/lib/freetype/src/gzip/adler32.c
diff --git a/GRRLIB/lib/freetype2/src/gzip/ftgzip.c b/GRRLIB/lib/freetype/src/gzip/ftgzip.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/ftgzip.c
rename to GRRLIB/lib/freetype/src/gzip/ftgzip.c
diff --git a/GRRLIB/lib/freetype2/src/gzip/infblock.c b/GRRLIB/lib/freetype/src/gzip/infblock.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/infblock.c
rename to GRRLIB/lib/freetype/src/gzip/infblock.c
diff --git a/GRRLIB/lib/freetype2/src/gzip/infblock.h b/GRRLIB/lib/freetype/src/gzip/infblock.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/infblock.h
rename to GRRLIB/lib/freetype/src/gzip/infblock.h
diff --git a/GRRLIB/lib/freetype2/src/gzip/infcodes.c b/GRRLIB/lib/freetype/src/gzip/infcodes.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/infcodes.c
rename to GRRLIB/lib/freetype/src/gzip/infcodes.c
diff --git a/GRRLIB/lib/freetype2/src/gzip/infcodes.h b/GRRLIB/lib/freetype/src/gzip/infcodes.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/infcodes.h
rename to GRRLIB/lib/freetype/src/gzip/infcodes.h
diff --git a/GRRLIB/lib/freetype2/src/gzip/inffixed.h b/GRRLIB/lib/freetype/src/gzip/inffixed.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/inffixed.h
rename to GRRLIB/lib/freetype/src/gzip/inffixed.h
diff --git a/GRRLIB/lib/freetype2/src/gzip/inflate.c b/GRRLIB/lib/freetype/src/gzip/inflate.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/inflate.c
rename to GRRLIB/lib/freetype/src/gzip/inflate.c
diff --git a/GRRLIB/lib/freetype2/src/gzip/inftrees.c b/GRRLIB/lib/freetype/src/gzip/inftrees.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/inftrees.c
rename to GRRLIB/lib/freetype/src/gzip/inftrees.c
diff --git a/GRRLIB/lib/freetype2/src/gzip/inftrees.h b/GRRLIB/lib/freetype/src/gzip/inftrees.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/inftrees.h
rename to GRRLIB/lib/freetype/src/gzip/inftrees.h
diff --git a/GRRLIB/lib/freetype2/src/gzip/infutil.c b/GRRLIB/lib/freetype/src/gzip/infutil.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/infutil.c
rename to GRRLIB/lib/freetype/src/gzip/infutil.c
diff --git a/GRRLIB/lib/freetype2/src/gzip/infutil.h b/GRRLIB/lib/freetype/src/gzip/infutil.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/infutil.h
rename to GRRLIB/lib/freetype/src/gzip/infutil.h
diff --git a/GRRLIB/lib/freetype2/src/gzip/rules.mk b/GRRLIB/lib/freetype/src/gzip/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/rules.mk
rename to GRRLIB/lib/freetype/src/gzip/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/gzip/zconf.h b/GRRLIB/lib/freetype/src/gzip/zconf.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/zconf.h
rename to GRRLIB/lib/freetype/src/gzip/zconf.h
diff --git a/GRRLIB/lib/freetype2/src/gzip/zlib.h b/GRRLIB/lib/freetype/src/gzip/zlib.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/zlib.h
rename to GRRLIB/lib/freetype/src/gzip/zlib.h
diff --git a/GRRLIB/lib/freetype2/src/gzip/zutil.c b/GRRLIB/lib/freetype/src/gzip/zutil.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/zutil.c
rename to GRRLIB/lib/freetype/src/gzip/zutil.c
diff --git a/GRRLIB/lib/freetype2/src/gzip/zutil.h b/GRRLIB/lib/freetype/src/gzip/zutil.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/gzip/zutil.h
rename to GRRLIB/lib/freetype/src/gzip/zutil.h
diff --git a/GRRLIB/lib/freetype2/src/lzw/ftlzw.c b/GRRLIB/lib/freetype/src/lzw/ftlzw.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/lzw/ftlzw.c
rename to GRRLIB/lib/freetype/src/lzw/ftlzw.c
diff --git a/GRRLIB/lib/freetype2/src/lzw/ftzopen.c b/GRRLIB/lib/freetype/src/lzw/ftzopen.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/lzw/ftzopen.c
rename to GRRLIB/lib/freetype/src/lzw/ftzopen.c
diff --git a/GRRLIB/lib/freetype2/src/lzw/ftzopen.h b/GRRLIB/lib/freetype/src/lzw/ftzopen.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/lzw/ftzopen.h
rename to GRRLIB/lib/freetype/src/lzw/ftzopen.h
diff --git a/GRRLIB/lib/freetype2/src/lzw/rules.mk b/GRRLIB/lib/freetype/src/lzw/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/lzw/rules.mk
rename to GRRLIB/lib/freetype/src/lzw/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/otvalid/module.mk b/GRRLIB/lib/freetype/src/otvalid/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/module.mk
rename to GRRLIB/lib/freetype/src/otvalid/module.mk
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvalid.c b/GRRLIB/lib/freetype/src/otvalid/otvalid.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvalid.c
rename to GRRLIB/lib/freetype/src/otvalid/otvalid.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvalid.h b/GRRLIB/lib/freetype/src/otvalid/otvalid.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvalid.h
rename to GRRLIB/lib/freetype/src/otvalid/otvalid.h
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvbase.c b/GRRLIB/lib/freetype/src/otvalid/otvbase.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvbase.c
rename to GRRLIB/lib/freetype/src/otvalid/otvbase.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvcommn.c b/GRRLIB/lib/freetype/src/otvalid/otvcommn.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvcommn.c
rename to GRRLIB/lib/freetype/src/otvalid/otvcommn.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvcommn.h b/GRRLIB/lib/freetype/src/otvalid/otvcommn.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvcommn.h
rename to GRRLIB/lib/freetype/src/otvalid/otvcommn.h
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otverror.h b/GRRLIB/lib/freetype/src/otvalid/otverror.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otverror.h
rename to GRRLIB/lib/freetype/src/otvalid/otverror.h
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvgdef.c b/GRRLIB/lib/freetype/src/otvalid/otvgdef.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvgdef.c
rename to GRRLIB/lib/freetype/src/otvalid/otvgdef.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvgpos.c b/GRRLIB/lib/freetype/src/otvalid/otvgpos.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvgpos.c
rename to GRRLIB/lib/freetype/src/otvalid/otvgpos.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvgpos.h b/GRRLIB/lib/freetype/src/otvalid/otvgpos.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvgpos.h
rename to GRRLIB/lib/freetype/src/otvalid/otvgpos.h
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvgsub.c b/GRRLIB/lib/freetype/src/otvalid/otvgsub.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvgsub.c
rename to GRRLIB/lib/freetype/src/otvalid/otvgsub.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvjstf.c b/GRRLIB/lib/freetype/src/otvalid/otvjstf.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvjstf.c
rename to GRRLIB/lib/freetype/src/otvalid/otvjstf.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvmath.c b/GRRLIB/lib/freetype/src/otvalid/otvmath.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvmath.c
rename to GRRLIB/lib/freetype/src/otvalid/otvmath.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvmod.c b/GRRLIB/lib/freetype/src/otvalid/otvmod.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvmod.c
rename to GRRLIB/lib/freetype/src/otvalid/otvmod.c
diff --git a/GRRLIB/lib/freetype2/src/otvalid/otvmod.h b/GRRLIB/lib/freetype/src/otvalid/otvmod.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/otvmod.h
rename to GRRLIB/lib/freetype/src/otvalid/otvmod.h
diff --git a/GRRLIB/lib/freetype2/src/otvalid/rules.mk b/GRRLIB/lib/freetype/src/otvalid/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/otvalid/rules.mk
rename to GRRLIB/lib/freetype/src/otvalid/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/pcf/README b/GRRLIB/lib/freetype/src/pcf/README
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/README
rename to GRRLIB/lib/freetype/src/pcf/README
diff --git a/GRRLIB/lib/freetype2/src/pcf/module.mk b/GRRLIB/lib/freetype/src/pcf/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/module.mk
rename to GRRLIB/lib/freetype/src/pcf/module.mk
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcf.c b/GRRLIB/lib/freetype/src/pcf/pcf.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcf.c
rename to GRRLIB/lib/freetype/src/pcf/pcf.c
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcf.h b/GRRLIB/lib/freetype/src/pcf/pcf.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcf.h
rename to GRRLIB/lib/freetype/src/pcf/pcf.h
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcfdrivr.c b/GRRLIB/lib/freetype/src/pcf/pcfdrivr.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcfdrivr.c
rename to GRRLIB/lib/freetype/src/pcf/pcfdrivr.c
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcfdrivr.h b/GRRLIB/lib/freetype/src/pcf/pcfdrivr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcfdrivr.h
rename to GRRLIB/lib/freetype/src/pcf/pcfdrivr.h
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcferror.h b/GRRLIB/lib/freetype/src/pcf/pcferror.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcferror.h
rename to GRRLIB/lib/freetype/src/pcf/pcferror.h
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcfread.c b/GRRLIB/lib/freetype/src/pcf/pcfread.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcfread.c
rename to GRRLIB/lib/freetype/src/pcf/pcfread.c
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcfread.h b/GRRLIB/lib/freetype/src/pcf/pcfread.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcfread.h
rename to GRRLIB/lib/freetype/src/pcf/pcfread.h
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcfutil.c b/GRRLIB/lib/freetype/src/pcf/pcfutil.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcfutil.c
rename to GRRLIB/lib/freetype/src/pcf/pcfutil.c
diff --git a/GRRLIB/lib/freetype2/src/pcf/pcfutil.h b/GRRLIB/lib/freetype/src/pcf/pcfutil.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/pcfutil.h
rename to GRRLIB/lib/freetype/src/pcf/pcfutil.h
diff --git a/GRRLIB/lib/freetype2/src/pcf/rules.mk b/GRRLIB/lib/freetype/src/pcf/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pcf/rules.mk
rename to GRRLIB/lib/freetype/src/pcf/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/pfr/module.mk b/GRRLIB/lib/freetype/src/pfr/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/module.mk
rename to GRRLIB/lib/freetype/src/pfr/module.mk
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfr.c b/GRRLIB/lib/freetype/src/pfr/pfr.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfr.c
rename to GRRLIB/lib/freetype/src/pfr/pfr.c
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrcmap.c b/GRRLIB/lib/freetype/src/pfr/pfrcmap.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrcmap.c
rename to GRRLIB/lib/freetype/src/pfr/pfrcmap.c
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrcmap.h b/GRRLIB/lib/freetype/src/pfr/pfrcmap.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrcmap.h
rename to GRRLIB/lib/freetype/src/pfr/pfrcmap.h
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrdrivr.c b/GRRLIB/lib/freetype/src/pfr/pfrdrivr.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrdrivr.c
rename to GRRLIB/lib/freetype/src/pfr/pfrdrivr.c
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrdrivr.h b/GRRLIB/lib/freetype/src/pfr/pfrdrivr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrdrivr.h
rename to GRRLIB/lib/freetype/src/pfr/pfrdrivr.h
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrerror.h b/GRRLIB/lib/freetype/src/pfr/pfrerror.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrerror.h
rename to GRRLIB/lib/freetype/src/pfr/pfrerror.h
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrgload.c b/GRRLIB/lib/freetype/src/pfr/pfrgload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrgload.c
rename to GRRLIB/lib/freetype/src/pfr/pfrgload.c
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrgload.h b/GRRLIB/lib/freetype/src/pfr/pfrgload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrgload.h
rename to GRRLIB/lib/freetype/src/pfr/pfrgload.h
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrload.c b/GRRLIB/lib/freetype/src/pfr/pfrload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrload.c
rename to GRRLIB/lib/freetype/src/pfr/pfrload.c
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrload.h b/GRRLIB/lib/freetype/src/pfr/pfrload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrload.h
rename to GRRLIB/lib/freetype/src/pfr/pfrload.h
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrobjs.c b/GRRLIB/lib/freetype/src/pfr/pfrobjs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrobjs.c
rename to GRRLIB/lib/freetype/src/pfr/pfrobjs.c
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrobjs.h b/GRRLIB/lib/freetype/src/pfr/pfrobjs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrobjs.h
rename to GRRLIB/lib/freetype/src/pfr/pfrobjs.h
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrsbit.c b/GRRLIB/lib/freetype/src/pfr/pfrsbit.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrsbit.c
rename to GRRLIB/lib/freetype/src/pfr/pfrsbit.c
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrsbit.h b/GRRLIB/lib/freetype/src/pfr/pfrsbit.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrsbit.h
rename to GRRLIB/lib/freetype/src/pfr/pfrsbit.h
diff --git a/GRRLIB/lib/freetype2/src/pfr/pfrtypes.h b/GRRLIB/lib/freetype/src/pfr/pfrtypes.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/pfrtypes.h
rename to GRRLIB/lib/freetype/src/pfr/pfrtypes.h
diff --git a/GRRLIB/lib/freetype2/src/pfr/rules.mk b/GRRLIB/lib/freetype/src/pfr/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pfr/rules.mk
rename to GRRLIB/lib/freetype/src/pfr/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/psaux/afmparse.c b/GRRLIB/lib/freetype/src/psaux/afmparse.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/afmparse.c
rename to GRRLIB/lib/freetype/src/psaux/afmparse.c
diff --git a/GRRLIB/lib/freetype2/src/psaux/afmparse.h b/GRRLIB/lib/freetype/src/psaux/afmparse.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/afmparse.h
rename to GRRLIB/lib/freetype/src/psaux/afmparse.h
diff --git a/GRRLIB/lib/freetype2/src/psaux/module.mk b/GRRLIB/lib/freetype/src/psaux/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/module.mk
rename to GRRLIB/lib/freetype/src/psaux/module.mk
diff --git a/GRRLIB/lib/freetype2/src/psaux/psaux.c b/GRRLIB/lib/freetype/src/psaux/psaux.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/psaux.c
rename to GRRLIB/lib/freetype/src/psaux/psaux.c
diff --git a/GRRLIB/lib/freetype2/src/psaux/psauxerr.h b/GRRLIB/lib/freetype/src/psaux/psauxerr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/psauxerr.h
rename to GRRLIB/lib/freetype/src/psaux/psauxerr.h
diff --git a/GRRLIB/lib/freetype2/src/psaux/psauxmod.c b/GRRLIB/lib/freetype/src/psaux/psauxmod.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/psauxmod.c
rename to GRRLIB/lib/freetype/src/psaux/psauxmod.c
diff --git a/GRRLIB/lib/freetype2/src/psaux/psauxmod.h b/GRRLIB/lib/freetype/src/psaux/psauxmod.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/psauxmod.h
rename to GRRLIB/lib/freetype/src/psaux/psauxmod.h
diff --git a/GRRLIB/lib/freetype2/src/psaux/psconv.c b/GRRLIB/lib/freetype/src/psaux/psconv.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/psconv.c
rename to GRRLIB/lib/freetype/src/psaux/psconv.c
diff --git a/GRRLIB/lib/freetype2/src/psaux/psconv.h b/GRRLIB/lib/freetype/src/psaux/psconv.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/psconv.h
rename to GRRLIB/lib/freetype/src/psaux/psconv.h
diff --git a/GRRLIB/lib/freetype2/src/psaux/psobjs.c b/GRRLIB/lib/freetype/src/psaux/psobjs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/psobjs.c
rename to GRRLIB/lib/freetype/src/psaux/psobjs.c
diff --git a/GRRLIB/lib/freetype2/src/psaux/psobjs.h b/GRRLIB/lib/freetype/src/psaux/psobjs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/psobjs.h
rename to GRRLIB/lib/freetype/src/psaux/psobjs.h
diff --git a/GRRLIB/lib/freetype2/src/psaux/rules.mk b/GRRLIB/lib/freetype/src/psaux/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/rules.mk
rename to GRRLIB/lib/freetype/src/psaux/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/psaux/t1cmap.c b/GRRLIB/lib/freetype/src/psaux/t1cmap.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/t1cmap.c
rename to GRRLIB/lib/freetype/src/psaux/t1cmap.c
diff --git a/GRRLIB/lib/freetype2/src/psaux/t1cmap.h b/GRRLIB/lib/freetype/src/psaux/t1cmap.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/t1cmap.h
rename to GRRLIB/lib/freetype/src/psaux/t1cmap.h
diff --git a/GRRLIB/lib/freetype2/src/psaux/t1decode.c b/GRRLIB/lib/freetype/src/psaux/t1decode.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/t1decode.c
rename to GRRLIB/lib/freetype/src/psaux/t1decode.c
diff --git a/GRRLIB/lib/freetype2/src/psaux/t1decode.h b/GRRLIB/lib/freetype/src/psaux/t1decode.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psaux/t1decode.h
rename to GRRLIB/lib/freetype/src/psaux/t1decode.h
diff --git a/GRRLIB/lib/freetype2/src/pshinter/module.mk b/GRRLIB/lib/freetype/src/pshinter/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/module.mk
rename to GRRLIB/lib/freetype/src/pshinter/module.mk
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshalgo.c b/GRRLIB/lib/freetype/src/pshinter/pshalgo.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshalgo.c
rename to GRRLIB/lib/freetype/src/pshinter/pshalgo.c
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshalgo.h b/GRRLIB/lib/freetype/src/pshinter/pshalgo.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshalgo.h
rename to GRRLIB/lib/freetype/src/pshinter/pshalgo.h
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshglob.c b/GRRLIB/lib/freetype/src/pshinter/pshglob.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshglob.c
rename to GRRLIB/lib/freetype/src/pshinter/pshglob.c
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshglob.h b/GRRLIB/lib/freetype/src/pshinter/pshglob.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshglob.h
rename to GRRLIB/lib/freetype/src/pshinter/pshglob.h
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshinter.c b/GRRLIB/lib/freetype/src/pshinter/pshinter.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshinter.c
rename to GRRLIB/lib/freetype/src/pshinter/pshinter.c
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshmod.c b/GRRLIB/lib/freetype/src/pshinter/pshmod.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshmod.c
rename to GRRLIB/lib/freetype/src/pshinter/pshmod.c
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshmod.h b/GRRLIB/lib/freetype/src/pshinter/pshmod.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshmod.h
rename to GRRLIB/lib/freetype/src/pshinter/pshmod.h
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshnterr.h b/GRRLIB/lib/freetype/src/pshinter/pshnterr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshnterr.h
rename to GRRLIB/lib/freetype/src/pshinter/pshnterr.h
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshpic.c b/GRRLIB/lib/freetype/src/pshinter/pshpic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshpic.c
rename to GRRLIB/lib/freetype/src/pshinter/pshpic.c
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshpic.h b/GRRLIB/lib/freetype/src/pshinter/pshpic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshpic.h
rename to GRRLIB/lib/freetype/src/pshinter/pshpic.h
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshrec.c b/GRRLIB/lib/freetype/src/pshinter/pshrec.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshrec.c
rename to GRRLIB/lib/freetype/src/pshinter/pshrec.c
diff --git a/GRRLIB/lib/freetype2/src/pshinter/pshrec.h b/GRRLIB/lib/freetype/src/pshinter/pshrec.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/pshrec.h
rename to GRRLIB/lib/freetype/src/pshinter/pshrec.h
diff --git a/GRRLIB/lib/freetype2/src/pshinter/rules.mk b/GRRLIB/lib/freetype/src/pshinter/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/pshinter/rules.mk
rename to GRRLIB/lib/freetype/src/pshinter/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/psnames/module.mk b/GRRLIB/lib/freetype/src/psnames/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/module.mk
rename to GRRLIB/lib/freetype/src/psnames/module.mk
diff --git a/GRRLIB/lib/freetype2/src/psnames/psmodule.c b/GRRLIB/lib/freetype/src/psnames/psmodule.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/psmodule.c
rename to GRRLIB/lib/freetype/src/psnames/psmodule.c
diff --git a/GRRLIB/lib/freetype2/src/psnames/psmodule.h b/GRRLIB/lib/freetype/src/psnames/psmodule.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/psmodule.h
rename to GRRLIB/lib/freetype/src/psnames/psmodule.h
diff --git a/GRRLIB/lib/freetype2/src/psnames/psnamerr.h b/GRRLIB/lib/freetype/src/psnames/psnamerr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/psnamerr.h
rename to GRRLIB/lib/freetype/src/psnames/psnamerr.h
diff --git a/GRRLIB/lib/freetype2/src/psnames/psnames.c b/GRRLIB/lib/freetype/src/psnames/psnames.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/psnames.c
rename to GRRLIB/lib/freetype/src/psnames/psnames.c
diff --git a/GRRLIB/lib/freetype2/src/psnames/pspic.c b/GRRLIB/lib/freetype/src/psnames/pspic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/pspic.c
rename to GRRLIB/lib/freetype/src/psnames/pspic.c
diff --git a/GRRLIB/lib/freetype2/src/psnames/pspic.h b/GRRLIB/lib/freetype/src/psnames/pspic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/pspic.h
rename to GRRLIB/lib/freetype/src/psnames/pspic.h
diff --git a/GRRLIB/lib/freetype2/src/psnames/pstables.h b/GRRLIB/lib/freetype/src/psnames/pstables.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/pstables.h
rename to GRRLIB/lib/freetype/src/psnames/pstables.h
diff --git a/GRRLIB/lib/freetype2/src/psnames/rules.mk b/GRRLIB/lib/freetype/src/psnames/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/psnames/rules.mk
rename to GRRLIB/lib/freetype/src/psnames/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/raster/ftmisc.h b/GRRLIB/lib/freetype/src/raster/ftmisc.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/ftmisc.h
rename to GRRLIB/lib/freetype/src/raster/ftmisc.h
diff --git a/GRRLIB/lib/freetype2/src/raster/ftraster.c b/GRRLIB/lib/freetype/src/raster/ftraster.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/ftraster.c
rename to GRRLIB/lib/freetype/src/raster/ftraster.c
diff --git a/GRRLIB/lib/freetype2/src/raster/ftraster.h b/GRRLIB/lib/freetype/src/raster/ftraster.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/ftraster.h
rename to GRRLIB/lib/freetype/src/raster/ftraster.h
diff --git a/GRRLIB/lib/freetype2/src/raster/ftrend1.c b/GRRLIB/lib/freetype/src/raster/ftrend1.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/ftrend1.c
rename to GRRLIB/lib/freetype/src/raster/ftrend1.c
diff --git a/GRRLIB/lib/freetype2/src/raster/ftrend1.h b/GRRLIB/lib/freetype/src/raster/ftrend1.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/ftrend1.h
rename to GRRLIB/lib/freetype/src/raster/ftrend1.h
diff --git a/GRRLIB/lib/freetype2/src/raster/module.mk b/GRRLIB/lib/freetype/src/raster/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/module.mk
rename to GRRLIB/lib/freetype/src/raster/module.mk
diff --git a/GRRLIB/lib/freetype2/src/raster/raster.c b/GRRLIB/lib/freetype/src/raster/raster.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/raster.c
rename to GRRLIB/lib/freetype/src/raster/raster.c
diff --git a/GRRLIB/lib/freetype2/src/raster/rasterrs.h b/GRRLIB/lib/freetype/src/raster/rasterrs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/rasterrs.h
rename to GRRLIB/lib/freetype/src/raster/rasterrs.h
diff --git a/GRRLIB/lib/freetype2/src/raster/rastpic.c b/GRRLIB/lib/freetype/src/raster/rastpic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/rastpic.c
rename to GRRLIB/lib/freetype/src/raster/rastpic.c
diff --git a/GRRLIB/lib/freetype2/src/raster/rastpic.h b/GRRLIB/lib/freetype/src/raster/rastpic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/rastpic.h
rename to GRRLIB/lib/freetype/src/raster/rastpic.h
diff --git a/GRRLIB/lib/freetype2/src/raster/rules.mk b/GRRLIB/lib/freetype/src/raster/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/raster/rules.mk
rename to GRRLIB/lib/freetype/src/raster/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/sfnt/module.mk b/GRRLIB/lib/freetype/src/sfnt/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/module.mk
rename to GRRLIB/lib/freetype/src/sfnt/module.mk
diff --git a/GRRLIB/lib/freetype2/src/sfnt/rules.mk b/GRRLIB/lib/freetype/src/sfnt/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/rules.mk
rename to GRRLIB/lib/freetype/src/sfnt/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/sfnt/sfdriver.c b/GRRLIB/lib/freetype/src/sfnt/sfdriver.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/sfdriver.c
rename to GRRLIB/lib/freetype/src/sfnt/sfdriver.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/sfdriver.h b/GRRLIB/lib/freetype/src/sfnt/sfdriver.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/sfdriver.h
rename to GRRLIB/lib/freetype/src/sfnt/sfdriver.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/sferrors.h b/GRRLIB/lib/freetype/src/sfnt/sferrors.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/sferrors.h
rename to GRRLIB/lib/freetype/src/sfnt/sferrors.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/sfnt.c b/GRRLIB/lib/freetype/src/sfnt/sfnt.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/sfnt.c
rename to GRRLIB/lib/freetype/src/sfnt/sfnt.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/sfntpic.c b/GRRLIB/lib/freetype/src/sfnt/sfntpic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/sfntpic.c
rename to GRRLIB/lib/freetype/src/sfnt/sfntpic.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/sfntpic.h b/GRRLIB/lib/freetype/src/sfnt/sfntpic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/sfntpic.h
rename to GRRLIB/lib/freetype/src/sfnt/sfntpic.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/sfobjs.c b/GRRLIB/lib/freetype/src/sfnt/sfobjs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/sfobjs.c
rename to GRRLIB/lib/freetype/src/sfnt/sfobjs.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/sfobjs.h b/GRRLIB/lib/freetype/src/sfnt/sfobjs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/sfobjs.h
rename to GRRLIB/lib/freetype/src/sfnt/sfobjs.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttbdf.c b/GRRLIB/lib/freetype/src/sfnt/ttbdf.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttbdf.c
rename to GRRLIB/lib/freetype/src/sfnt/ttbdf.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttbdf.h b/GRRLIB/lib/freetype/src/sfnt/ttbdf.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttbdf.h
rename to GRRLIB/lib/freetype/src/sfnt/ttbdf.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttcmap.c b/GRRLIB/lib/freetype/src/sfnt/ttcmap.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttcmap.c
rename to GRRLIB/lib/freetype/src/sfnt/ttcmap.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttcmap.h b/GRRLIB/lib/freetype/src/sfnt/ttcmap.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttcmap.h
rename to GRRLIB/lib/freetype/src/sfnt/ttcmap.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttcmapc.h b/GRRLIB/lib/freetype/src/sfnt/ttcmapc.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttcmapc.h
rename to GRRLIB/lib/freetype/src/sfnt/ttcmapc.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttkern.c b/GRRLIB/lib/freetype/src/sfnt/ttkern.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttkern.c
rename to GRRLIB/lib/freetype/src/sfnt/ttkern.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttkern.h b/GRRLIB/lib/freetype/src/sfnt/ttkern.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttkern.h
rename to GRRLIB/lib/freetype/src/sfnt/ttkern.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttload.c b/GRRLIB/lib/freetype/src/sfnt/ttload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttload.c
rename to GRRLIB/lib/freetype/src/sfnt/ttload.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttload.h b/GRRLIB/lib/freetype/src/sfnt/ttload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttload.h
rename to GRRLIB/lib/freetype/src/sfnt/ttload.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttmtx.c b/GRRLIB/lib/freetype/src/sfnt/ttmtx.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttmtx.c
rename to GRRLIB/lib/freetype/src/sfnt/ttmtx.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttmtx.h b/GRRLIB/lib/freetype/src/sfnt/ttmtx.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttmtx.h
rename to GRRLIB/lib/freetype/src/sfnt/ttmtx.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttpost.c b/GRRLIB/lib/freetype/src/sfnt/ttpost.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttpost.c
rename to GRRLIB/lib/freetype/src/sfnt/ttpost.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttpost.h b/GRRLIB/lib/freetype/src/sfnt/ttpost.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttpost.h
rename to GRRLIB/lib/freetype/src/sfnt/ttpost.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttsbit.c b/GRRLIB/lib/freetype/src/sfnt/ttsbit.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttsbit.c
rename to GRRLIB/lib/freetype/src/sfnt/ttsbit.c
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttsbit.h b/GRRLIB/lib/freetype/src/sfnt/ttsbit.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttsbit.h
rename to GRRLIB/lib/freetype/src/sfnt/ttsbit.h
diff --git a/GRRLIB/lib/freetype2/src/sfnt/ttsbit0.c b/GRRLIB/lib/freetype/src/sfnt/ttsbit0.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/sfnt/ttsbit0.c
rename to GRRLIB/lib/freetype/src/sfnt/ttsbit0.c
diff --git a/GRRLIB/lib/freetype2/src/smooth/ftgrays.c b/GRRLIB/lib/freetype/src/smooth/ftgrays.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/ftgrays.c
rename to GRRLIB/lib/freetype/src/smooth/ftgrays.c
diff --git a/GRRLIB/lib/freetype2/src/smooth/ftgrays.h b/GRRLIB/lib/freetype/src/smooth/ftgrays.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/ftgrays.h
rename to GRRLIB/lib/freetype/src/smooth/ftgrays.h
diff --git a/GRRLIB/lib/freetype2/src/smooth/ftsmerrs.h b/GRRLIB/lib/freetype/src/smooth/ftsmerrs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/ftsmerrs.h
rename to GRRLIB/lib/freetype/src/smooth/ftsmerrs.h
diff --git a/GRRLIB/lib/freetype2/src/smooth/ftsmooth.c b/GRRLIB/lib/freetype/src/smooth/ftsmooth.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/ftsmooth.c
rename to GRRLIB/lib/freetype/src/smooth/ftsmooth.c
diff --git a/GRRLIB/lib/freetype2/src/smooth/ftsmooth.h b/GRRLIB/lib/freetype/src/smooth/ftsmooth.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/ftsmooth.h
rename to GRRLIB/lib/freetype/src/smooth/ftsmooth.h
diff --git a/GRRLIB/lib/freetype2/src/smooth/ftspic.c b/GRRLIB/lib/freetype/src/smooth/ftspic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/ftspic.c
rename to GRRLIB/lib/freetype/src/smooth/ftspic.c
diff --git a/GRRLIB/lib/freetype2/src/smooth/ftspic.h b/GRRLIB/lib/freetype/src/smooth/ftspic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/ftspic.h
rename to GRRLIB/lib/freetype/src/smooth/ftspic.h
diff --git a/GRRLIB/lib/freetype2/src/smooth/module.mk b/GRRLIB/lib/freetype/src/smooth/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/module.mk
rename to GRRLIB/lib/freetype/src/smooth/module.mk
diff --git a/GRRLIB/lib/freetype2/src/smooth/rules.mk b/GRRLIB/lib/freetype/src/smooth/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/rules.mk
rename to GRRLIB/lib/freetype/src/smooth/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/smooth/smooth.c b/GRRLIB/lib/freetype/src/smooth/smooth.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/smooth/smooth.c
rename to GRRLIB/lib/freetype/src/smooth/smooth.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/module.mk b/GRRLIB/lib/freetype/src/truetype/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/module.mk
rename to GRRLIB/lib/freetype/src/truetype/module.mk
diff --git a/GRRLIB/lib/freetype2/src/truetype/rules.mk b/GRRLIB/lib/freetype/src/truetype/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/rules.mk
rename to GRRLIB/lib/freetype/src/truetype/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/truetype/truetype.c b/GRRLIB/lib/freetype/src/truetype/truetype.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/truetype.c
rename to GRRLIB/lib/freetype/src/truetype/truetype.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttdriver.c b/GRRLIB/lib/freetype/src/truetype/ttdriver.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttdriver.c
rename to GRRLIB/lib/freetype/src/truetype/ttdriver.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttdriver.h b/GRRLIB/lib/freetype/src/truetype/ttdriver.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttdriver.h
rename to GRRLIB/lib/freetype/src/truetype/ttdriver.h
diff --git a/GRRLIB/lib/freetype2/src/truetype/tterrors.h b/GRRLIB/lib/freetype/src/truetype/tterrors.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/tterrors.h
rename to GRRLIB/lib/freetype/src/truetype/tterrors.h
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttgload.c b/GRRLIB/lib/freetype/src/truetype/ttgload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttgload.c
rename to GRRLIB/lib/freetype/src/truetype/ttgload.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttgload.h b/GRRLIB/lib/freetype/src/truetype/ttgload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttgload.h
rename to GRRLIB/lib/freetype/src/truetype/ttgload.h
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttgxvar.c b/GRRLIB/lib/freetype/src/truetype/ttgxvar.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttgxvar.c
rename to GRRLIB/lib/freetype/src/truetype/ttgxvar.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttgxvar.h b/GRRLIB/lib/freetype/src/truetype/ttgxvar.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttgxvar.h
rename to GRRLIB/lib/freetype/src/truetype/ttgxvar.h
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttinterp.c b/GRRLIB/lib/freetype/src/truetype/ttinterp.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttinterp.c
rename to GRRLIB/lib/freetype/src/truetype/ttinterp.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttinterp.h b/GRRLIB/lib/freetype/src/truetype/ttinterp.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttinterp.h
rename to GRRLIB/lib/freetype/src/truetype/ttinterp.h
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttobjs.c b/GRRLIB/lib/freetype/src/truetype/ttobjs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttobjs.c
rename to GRRLIB/lib/freetype/src/truetype/ttobjs.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttobjs.h b/GRRLIB/lib/freetype/src/truetype/ttobjs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttobjs.h
rename to GRRLIB/lib/freetype/src/truetype/ttobjs.h
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttpic.c b/GRRLIB/lib/freetype/src/truetype/ttpic.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttpic.c
rename to GRRLIB/lib/freetype/src/truetype/ttpic.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttpic.h b/GRRLIB/lib/freetype/src/truetype/ttpic.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttpic.h
rename to GRRLIB/lib/freetype/src/truetype/ttpic.h
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttpload.c b/GRRLIB/lib/freetype/src/truetype/ttpload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttpload.c
rename to GRRLIB/lib/freetype/src/truetype/ttpload.c
diff --git a/GRRLIB/lib/freetype2/src/truetype/ttpload.h b/GRRLIB/lib/freetype/src/truetype/ttpload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/truetype/ttpload.h
rename to GRRLIB/lib/freetype/src/truetype/ttpload.h
diff --git a/GRRLIB/lib/freetype2/src/type1/module.mk b/GRRLIB/lib/freetype/src/type1/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/module.mk
rename to GRRLIB/lib/freetype/src/type1/module.mk
diff --git a/GRRLIB/lib/freetype2/src/type1/rules.mk b/GRRLIB/lib/freetype/src/type1/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/rules.mk
rename to GRRLIB/lib/freetype/src/type1/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/type1/t1afm.c b/GRRLIB/lib/freetype/src/type1/t1afm.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1afm.c
rename to GRRLIB/lib/freetype/src/type1/t1afm.c
diff --git a/GRRLIB/lib/freetype2/src/type1/t1afm.h b/GRRLIB/lib/freetype/src/type1/t1afm.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1afm.h
rename to GRRLIB/lib/freetype/src/type1/t1afm.h
diff --git a/GRRLIB/lib/freetype2/src/type1/t1driver.c b/GRRLIB/lib/freetype/src/type1/t1driver.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1driver.c
rename to GRRLIB/lib/freetype/src/type1/t1driver.c
diff --git a/GRRLIB/lib/freetype2/src/type1/t1driver.h b/GRRLIB/lib/freetype/src/type1/t1driver.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1driver.h
rename to GRRLIB/lib/freetype/src/type1/t1driver.h
diff --git a/GRRLIB/lib/freetype2/src/type1/t1errors.h b/GRRLIB/lib/freetype/src/type1/t1errors.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1errors.h
rename to GRRLIB/lib/freetype/src/type1/t1errors.h
diff --git a/GRRLIB/lib/freetype2/src/type1/t1gload.c b/GRRLIB/lib/freetype/src/type1/t1gload.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1gload.c
rename to GRRLIB/lib/freetype/src/type1/t1gload.c
diff --git a/GRRLIB/lib/freetype2/src/type1/t1gload.h b/GRRLIB/lib/freetype/src/type1/t1gload.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1gload.h
rename to GRRLIB/lib/freetype/src/type1/t1gload.h
diff --git a/GRRLIB/lib/freetype2/src/type1/t1load.c b/GRRLIB/lib/freetype/src/type1/t1load.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1load.c
rename to GRRLIB/lib/freetype/src/type1/t1load.c
diff --git a/GRRLIB/lib/freetype2/src/type1/t1load.h b/GRRLIB/lib/freetype/src/type1/t1load.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1load.h
rename to GRRLIB/lib/freetype/src/type1/t1load.h
diff --git a/GRRLIB/lib/freetype2/src/type1/t1objs.c b/GRRLIB/lib/freetype/src/type1/t1objs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1objs.c
rename to GRRLIB/lib/freetype/src/type1/t1objs.c
diff --git a/GRRLIB/lib/freetype2/src/type1/t1objs.h b/GRRLIB/lib/freetype/src/type1/t1objs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1objs.h
rename to GRRLIB/lib/freetype/src/type1/t1objs.h
diff --git a/GRRLIB/lib/freetype2/src/type1/t1parse.c b/GRRLIB/lib/freetype/src/type1/t1parse.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1parse.c
rename to GRRLIB/lib/freetype/src/type1/t1parse.c
diff --git a/GRRLIB/lib/freetype2/src/type1/t1parse.h b/GRRLIB/lib/freetype/src/type1/t1parse.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1parse.h
rename to GRRLIB/lib/freetype/src/type1/t1parse.h
diff --git a/GRRLIB/lib/freetype2/src/type1/t1tokens.h b/GRRLIB/lib/freetype/src/type1/t1tokens.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/t1tokens.h
rename to GRRLIB/lib/freetype/src/type1/t1tokens.h
diff --git a/GRRLIB/lib/freetype2/src/type1/type1.c b/GRRLIB/lib/freetype/src/type1/type1.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type1/type1.c
rename to GRRLIB/lib/freetype/src/type1/type1.c
diff --git a/GRRLIB/lib/freetype2/src/type42/module.mk b/GRRLIB/lib/freetype/src/type42/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/module.mk
rename to GRRLIB/lib/freetype/src/type42/module.mk
diff --git a/GRRLIB/lib/freetype2/src/type42/rules.mk b/GRRLIB/lib/freetype/src/type42/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/rules.mk
rename to GRRLIB/lib/freetype/src/type42/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/type42/t42drivr.c b/GRRLIB/lib/freetype/src/type42/t42drivr.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/t42drivr.c
rename to GRRLIB/lib/freetype/src/type42/t42drivr.c
diff --git a/GRRLIB/lib/freetype2/src/type42/t42drivr.h b/GRRLIB/lib/freetype/src/type42/t42drivr.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/t42drivr.h
rename to GRRLIB/lib/freetype/src/type42/t42drivr.h
diff --git a/GRRLIB/lib/freetype2/src/type42/t42error.h b/GRRLIB/lib/freetype/src/type42/t42error.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/t42error.h
rename to GRRLIB/lib/freetype/src/type42/t42error.h
diff --git a/GRRLIB/lib/freetype2/src/type42/t42objs.c b/GRRLIB/lib/freetype/src/type42/t42objs.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/t42objs.c
rename to GRRLIB/lib/freetype/src/type42/t42objs.c
diff --git a/GRRLIB/lib/freetype2/src/type42/t42objs.h b/GRRLIB/lib/freetype/src/type42/t42objs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/t42objs.h
rename to GRRLIB/lib/freetype/src/type42/t42objs.h
diff --git a/GRRLIB/lib/freetype2/src/type42/t42parse.c b/GRRLIB/lib/freetype/src/type42/t42parse.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/t42parse.c
rename to GRRLIB/lib/freetype/src/type42/t42parse.c
diff --git a/GRRLIB/lib/freetype2/src/type42/t42parse.h b/GRRLIB/lib/freetype/src/type42/t42parse.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/t42parse.h
rename to GRRLIB/lib/freetype/src/type42/t42parse.h
diff --git a/GRRLIB/lib/freetype2/src/type42/t42types.h b/GRRLIB/lib/freetype/src/type42/t42types.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/t42types.h
rename to GRRLIB/lib/freetype/src/type42/t42types.h
diff --git a/GRRLIB/lib/freetype2/src/type42/type42.c b/GRRLIB/lib/freetype/src/type42/type42.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/type42/type42.c
rename to GRRLIB/lib/freetype/src/type42/type42.c
diff --git a/GRRLIB/lib/freetype2/src/winfonts/fnterrs.h b/GRRLIB/lib/freetype/src/winfonts/fnterrs.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/winfonts/fnterrs.h
rename to GRRLIB/lib/freetype/src/winfonts/fnterrs.h
diff --git a/GRRLIB/lib/freetype2/src/winfonts/module.mk b/GRRLIB/lib/freetype/src/winfonts/module.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/winfonts/module.mk
rename to GRRLIB/lib/freetype/src/winfonts/module.mk
diff --git a/GRRLIB/lib/freetype2/src/winfonts/rules.mk b/GRRLIB/lib/freetype/src/winfonts/rules.mk
similarity index 100%
rename from GRRLIB/lib/freetype2/src/winfonts/rules.mk
rename to GRRLIB/lib/freetype/src/winfonts/rules.mk
diff --git a/GRRLIB/lib/freetype2/src/winfonts/winfnt.c b/GRRLIB/lib/freetype/src/winfonts/winfnt.c
similarity index 100%
rename from GRRLIB/lib/freetype2/src/winfonts/winfnt.c
rename to GRRLIB/lib/freetype/src/winfonts/winfnt.c
diff --git a/GRRLIB/lib/freetype2/src/winfonts/winfnt.h b/GRRLIB/lib/freetype/src/winfonts/winfnt.h
similarity index 100%
rename from GRRLIB/lib/freetype2/src/winfonts/winfnt.h
rename to GRRLIB/lib/freetype/src/winfonts/winfnt.h
diff --git a/GRRLIB/lib/install.bat b/GRRLIB/lib/install.bat
index e144e84..a2a8c06 100644
--- a/GRRLIB/lib/install.bat
+++ b/GRRLIB/lib/install.bat
@@ -86,6 +86,17 @@ cd pngu
 cd ..
 
 Rem -- FreeType library
+echo.
+echo ---------------------------------------------------------------------------
+echo Building FreeType Library...
+echo.
+cd freetype
+  make clean -s
+  if errorlevel 1 goto error
+  make all
+  if errorlevel 1 goto error
+cd ..
+
 echo.
 echo ---------------------------------------------------------------------------
 echo Installing FreeType Library...
diff --git a/GRRLIB/lib/install.sh b/GRRLIB/lib/install.sh
index 0c8e151..1a641da 100644
--- a/GRRLIB/lib/install.sh
+++ b/GRRLIB/lib/install.sh
@@ -60,6 +60,13 @@ cd pngu
 cd ..
 
 # FreeType library
+echo -e "\n--------------------------------------------------------------------"
+echo -e "Building FreeType Library...\n"
+cd freetype
+  make clean
+  make all
+cd ..
+
 echo -e "\n--------------------------------------------------------------------"
 echo -e "Installing FreeType Library...\n"
 cd freetype