diff --git a/drivers/freetype/SCsub b/drivers/freetype/SCsub index 206da8dbe48..0ea29d25ab2 100644 --- a/drivers/freetype/SCsub +++ b/drivers/freetype/SCsub @@ -1,50 +1,49 @@ Import('env') ft_sources=[\ -"freetype/src/pfr/pfr.c",\ -"freetype/src/psaux/psaux.c",\ -"freetype/src/pcf/pcf.c",\ -"freetype/src/otvalid/otvalid.c",\ -"freetype/src/raster/raster.c",\ -"freetype/src/type1/type1.c",\ -"freetype/src/pshinter/pshinter.c",\ -"freetype/src/cff/cff.c",\ -"freetype/src/truetype/truetype.c",\ -"freetype/src/bdf/bdf.c",\ -"freetype/src/cache/ftcache.c",\ -"freetype/src/sfnt/sfnt.c",\ -"freetype/src/winfonts/winfnt.c",\ -"freetype/src/psnames/psnames.c",\ -"freetype/src/cid/type1cid.c",\ -"freetype/src/autofit/autofit.c",\ -"freetype/src/gxvalid/gxvalid.c",\ -"freetype/src/smooth/smooth.c",\ -"freetype/src/type42/type42.c",\ -"freetype/src/base/ftapi.c",\ -"freetype/src/base/ftbase.c",\ -"freetype/src/base/ftbbox.c",\ -"freetype/src/base/ftbdf.c",\ -"freetype/src/base/ftbitmap.c",\ -"freetype/src/base/ftcid.c",\ -"freetype/src/base/ftdebug.c",\ -"freetype/src/base/ftfstype.c",\ -"freetype/src/base/ftgasp.c",\ -"freetype/src/base/ftglyph.c",\ -"freetype/src/base/ftgxval.c",\ -"freetype/src/base/ftinit.c",\ -"freetype/src/base/ftlcdfil.c",\ -"freetype/src/base/ftmm.c",\ -"freetype/src/base/ftotval.c",\ -"freetype/src/base/ftpatent.c",\ -"freetype/src/base/ftpfr.c",\ -"freetype/src/base/ftpic.c",\ -"freetype/src/base/ftstroke.c",\ -"freetype/src/base/ftsynth.c",\ -"freetype/src/base/ftsystem.c",\ -"freetype/src/base/fttype1.c",\ -"freetype/src/base/ftwinfnt.c",\ -"freetype/src/base/ftxf86.c",\ - +"src/autofit/autofit.c",\ +"src/base/ftapi.c",\ +"src/base/ftbase.c",\ +"src/base/ftbbox.c",\ +"src/base/ftbdf.c",\ +"src/base/ftbitmap.c",\ +"src/base/ftcid.c",\ +"src/base/ftdebug.c",\ +"src/base/ftfstype.c",\ +"src/base/ftgasp.c",\ +"src/base/ftglyph.c",\ +"src/base/ftgxval.c",\ +"src/base/ftinit.c",\ +"src/base/ftlcdfil.c",\ +"src/base/ftmm.c",\ +"src/base/ftotval.c",\ +"src/base/ftpatent.c",\ +"src/base/ftpfr.c",\ +"src/base/ftpic.c",\ +"src/base/ftstroke.c",\ +"src/base/ftsynth.c",\ +"src/base/ftsystem.c",\ +"src/base/fttype1.c",\ +"src/base/ftwinfnt.c",\ +"src/base/ftxf86.c",\ +"src/bdf/bdf.c",\ +"src/cache/ftcache.c",\ +"src/cff/cff.c",\ +"src/cid/type1cid.c",\ +"src/gxvalid/gxvalid.c",\ +"src/otvalid/otvalid.c",\ +"src/pcf/pcf.c",\ +"src/pfr/pfr.c",\ +"src/psaux/psaux.c",\ +"src/pshinter/pshinter.c",\ +"src/psnames/psnames.c",\ +"src/raster/raster.c",\ +"src/sfnt/sfnt.c",\ +"src/smooth/smooth.c",\ +"src/truetype/truetype.c",\ +"src/type1/type1.c",\ +"src/type42/type42.c",\ +"src/winfonts/winfnt.c",\ ] @@ -53,7 +52,7 @@ if (env["freetype"]=="builtin"): half1=[] half2=[] for x in ft_sources: - if (x.find("freetype/src/base")==0 or x.find("freetype/src/sfnt")==0): + if (x.find("src/base")==0 or x.find("src/sfnt")==0): half2.append(x) else: half1.append(x) @@ -63,7 +62,7 @@ if (env["freetype"]=="builtin"): lib = env.Library("freetype_builtin2",half1) env.Append(LIBS=[lib]) - env.Append(CPPPATH=["#drivers/freetype/freetype/include"]) + env.Append(CPPPATH=["#drivers/freetype/include"]) Export('env') diff --git a/drivers/freetype/freetype/include/freetype/config/ftconfig.h b/drivers/freetype/include/freetype/config/ftconfig.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/config/ftconfig.h rename to drivers/freetype/include/freetype/config/ftconfig.h diff --git a/drivers/freetype/freetype/include/freetype/config/ftheader.h b/drivers/freetype/include/freetype/config/ftheader.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/config/ftheader.h rename to drivers/freetype/include/freetype/config/ftheader.h diff --git a/drivers/freetype/freetype/include/freetype/config/ftmodule.h b/drivers/freetype/include/freetype/config/ftmodule.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/config/ftmodule.h rename to drivers/freetype/include/freetype/config/ftmodule.h diff --git a/drivers/freetype/freetype/include/freetype/config/ftoption.h b/drivers/freetype/include/freetype/config/ftoption.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/config/ftoption.h rename to drivers/freetype/include/freetype/config/ftoption.h diff --git a/drivers/freetype/freetype/include/freetype/config/ftstdlib.h b/drivers/freetype/include/freetype/config/ftstdlib.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/config/ftstdlib.h rename to drivers/freetype/include/freetype/config/ftstdlib.h diff --git a/drivers/freetype/freetype/include/freetype/freetype.h b/drivers/freetype/include/freetype/freetype.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/freetype.h rename to drivers/freetype/include/freetype/freetype.h diff --git a/drivers/freetype/freetype/include/freetype/ftadvanc.h b/drivers/freetype/include/freetype/ftadvanc.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftadvanc.h rename to drivers/freetype/include/freetype/ftadvanc.h diff --git a/drivers/freetype/freetype/include/freetype/ftautoh.h b/drivers/freetype/include/freetype/ftautoh.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftautoh.h rename to drivers/freetype/include/freetype/ftautoh.h diff --git a/drivers/freetype/freetype/include/freetype/ftbbox.h b/drivers/freetype/include/freetype/ftbbox.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftbbox.h rename to drivers/freetype/include/freetype/ftbbox.h diff --git a/drivers/freetype/freetype/include/freetype/ftbdf.h b/drivers/freetype/include/freetype/ftbdf.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftbdf.h rename to drivers/freetype/include/freetype/ftbdf.h diff --git a/drivers/freetype/freetype/include/freetype/ftbitmap.h b/drivers/freetype/include/freetype/ftbitmap.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftbitmap.h rename to drivers/freetype/include/freetype/ftbitmap.h diff --git a/drivers/freetype/freetype/include/freetype/ftbzip2.h b/drivers/freetype/include/freetype/ftbzip2.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftbzip2.h rename to drivers/freetype/include/freetype/ftbzip2.h diff --git a/drivers/freetype/freetype/include/freetype/ftcache.h b/drivers/freetype/include/freetype/ftcache.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftcache.h rename to drivers/freetype/include/freetype/ftcache.h diff --git a/drivers/freetype/freetype/include/freetype/ftcffdrv.h b/drivers/freetype/include/freetype/ftcffdrv.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftcffdrv.h rename to drivers/freetype/include/freetype/ftcffdrv.h diff --git a/drivers/freetype/freetype/include/freetype/ftchapters.h b/drivers/freetype/include/freetype/ftchapters.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftchapters.h rename to drivers/freetype/include/freetype/ftchapters.h diff --git a/drivers/freetype/freetype/include/freetype/ftcid.h b/drivers/freetype/include/freetype/ftcid.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftcid.h rename to drivers/freetype/include/freetype/ftcid.h diff --git a/drivers/freetype/freetype/include/freetype/fterrdef.h b/drivers/freetype/include/freetype/fterrdef.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/fterrdef.h rename to drivers/freetype/include/freetype/fterrdef.h diff --git a/drivers/freetype/freetype/include/freetype/fterrors.h b/drivers/freetype/include/freetype/fterrors.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/fterrors.h rename to drivers/freetype/include/freetype/fterrors.h diff --git a/drivers/freetype/freetype/include/freetype/ftgasp.h b/drivers/freetype/include/freetype/ftgasp.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftgasp.h rename to drivers/freetype/include/freetype/ftgasp.h diff --git a/drivers/freetype/freetype/include/freetype/ftglyph.h b/drivers/freetype/include/freetype/ftglyph.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftglyph.h rename to drivers/freetype/include/freetype/ftglyph.h diff --git a/drivers/freetype/freetype/include/freetype/ftgxval.h b/drivers/freetype/include/freetype/ftgxval.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftgxval.h rename to drivers/freetype/include/freetype/ftgxval.h diff --git a/drivers/freetype/freetype/include/freetype/ftgzip.h b/drivers/freetype/include/freetype/ftgzip.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftgzip.h rename to drivers/freetype/include/freetype/ftgzip.h diff --git a/drivers/freetype/freetype/include/freetype/ftimage.h b/drivers/freetype/include/freetype/ftimage.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftimage.h rename to drivers/freetype/include/freetype/ftimage.h diff --git a/drivers/freetype/freetype/include/freetype/ftincrem.h b/drivers/freetype/include/freetype/ftincrem.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftincrem.h rename to drivers/freetype/include/freetype/ftincrem.h diff --git a/drivers/freetype/freetype/include/freetype/ftlcdfil.h b/drivers/freetype/include/freetype/ftlcdfil.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftlcdfil.h rename to drivers/freetype/include/freetype/ftlcdfil.h diff --git a/drivers/freetype/freetype/include/freetype/ftlist.h b/drivers/freetype/include/freetype/ftlist.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftlist.h rename to drivers/freetype/include/freetype/ftlist.h diff --git a/drivers/freetype/freetype/include/freetype/ftlzw.h b/drivers/freetype/include/freetype/ftlzw.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftlzw.h rename to drivers/freetype/include/freetype/ftlzw.h diff --git a/drivers/freetype/freetype/include/freetype/ftmac.h b/drivers/freetype/include/freetype/ftmac.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftmac.h rename to drivers/freetype/include/freetype/ftmac.h diff --git a/drivers/freetype/freetype/include/freetype/ftmm.h b/drivers/freetype/include/freetype/ftmm.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftmm.h rename to drivers/freetype/include/freetype/ftmm.h diff --git a/drivers/freetype/freetype/include/freetype/ftmodapi.h b/drivers/freetype/include/freetype/ftmodapi.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftmodapi.h rename to drivers/freetype/include/freetype/ftmodapi.h diff --git a/drivers/freetype/freetype/include/freetype/ftmoderr.h b/drivers/freetype/include/freetype/ftmoderr.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftmoderr.h rename to drivers/freetype/include/freetype/ftmoderr.h diff --git a/drivers/freetype/freetype/include/freetype/ftotval.h b/drivers/freetype/include/freetype/ftotval.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftotval.h rename to drivers/freetype/include/freetype/ftotval.h diff --git a/drivers/freetype/freetype/include/freetype/ftoutln.h b/drivers/freetype/include/freetype/ftoutln.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftoutln.h rename to drivers/freetype/include/freetype/ftoutln.h diff --git a/drivers/freetype/freetype/include/freetype/ftpfr.h b/drivers/freetype/include/freetype/ftpfr.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftpfr.h rename to drivers/freetype/include/freetype/ftpfr.h diff --git a/drivers/freetype/freetype/include/freetype/ftrender.h b/drivers/freetype/include/freetype/ftrender.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftrender.h rename to drivers/freetype/include/freetype/ftrender.h diff --git a/drivers/freetype/freetype/include/freetype/ftsizes.h b/drivers/freetype/include/freetype/ftsizes.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftsizes.h rename to drivers/freetype/include/freetype/ftsizes.h diff --git a/drivers/freetype/freetype/include/freetype/ftsnames.h b/drivers/freetype/include/freetype/ftsnames.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftsnames.h rename to drivers/freetype/include/freetype/ftsnames.h diff --git a/drivers/freetype/freetype/include/freetype/ftstroke.h b/drivers/freetype/include/freetype/ftstroke.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftstroke.h rename to drivers/freetype/include/freetype/ftstroke.h diff --git a/drivers/freetype/freetype/include/freetype/ftsynth.h b/drivers/freetype/include/freetype/ftsynth.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftsynth.h rename to drivers/freetype/include/freetype/ftsynth.h diff --git a/drivers/freetype/freetype/include/freetype/ftsystem.h b/drivers/freetype/include/freetype/ftsystem.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftsystem.h rename to drivers/freetype/include/freetype/ftsystem.h diff --git a/drivers/freetype/freetype/include/freetype/fttrigon.h b/drivers/freetype/include/freetype/fttrigon.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/fttrigon.h rename to drivers/freetype/include/freetype/fttrigon.h diff --git a/drivers/freetype/freetype/include/freetype/ftttdrv.h b/drivers/freetype/include/freetype/ftttdrv.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftttdrv.h rename to drivers/freetype/include/freetype/ftttdrv.h diff --git a/drivers/freetype/freetype/include/freetype/fttypes.h b/drivers/freetype/include/freetype/fttypes.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/fttypes.h rename to drivers/freetype/include/freetype/fttypes.h diff --git a/drivers/freetype/freetype/include/freetype/ftwinfnt.h b/drivers/freetype/include/freetype/ftwinfnt.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftwinfnt.h rename to drivers/freetype/include/freetype/ftwinfnt.h diff --git a/drivers/freetype/freetype/include/freetype/ftxf86.h b/drivers/freetype/include/freetype/ftxf86.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ftxf86.h rename to drivers/freetype/include/freetype/ftxf86.h diff --git a/drivers/freetype/freetype/include/freetype/internal/autohint.h b/drivers/freetype/include/freetype/internal/autohint.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/autohint.h rename to drivers/freetype/include/freetype/internal/autohint.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftcalc.h b/drivers/freetype/include/freetype/internal/ftcalc.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftcalc.h rename to drivers/freetype/include/freetype/internal/ftcalc.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftdebug.h b/drivers/freetype/include/freetype/internal/ftdebug.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftdebug.h rename to drivers/freetype/include/freetype/internal/ftdebug.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftdriver.h b/drivers/freetype/include/freetype/internal/ftdriver.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftdriver.h rename to drivers/freetype/include/freetype/internal/ftdriver.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftgloadr.h b/drivers/freetype/include/freetype/internal/ftgloadr.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftgloadr.h rename to drivers/freetype/include/freetype/internal/ftgloadr.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftmemory.h b/drivers/freetype/include/freetype/internal/ftmemory.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftmemory.h rename to drivers/freetype/include/freetype/internal/ftmemory.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftobjs.h b/drivers/freetype/include/freetype/internal/ftobjs.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftobjs.h rename to drivers/freetype/include/freetype/internal/ftobjs.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftpic.h b/drivers/freetype/include/freetype/internal/ftpic.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftpic.h rename to drivers/freetype/include/freetype/internal/ftpic.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftrfork.h b/drivers/freetype/include/freetype/internal/ftrfork.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftrfork.h rename to drivers/freetype/include/freetype/internal/ftrfork.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftserv.h b/drivers/freetype/include/freetype/internal/ftserv.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftserv.h rename to drivers/freetype/include/freetype/internal/ftserv.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftstream.h b/drivers/freetype/include/freetype/internal/ftstream.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftstream.h rename to drivers/freetype/include/freetype/internal/ftstream.h diff --git a/drivers/freetype/freetype/include/freetype/internal/fttrace.h b/drivers/freetype/include/freetype/internal/fttrace.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/fttrace.h rename to drivers/freetype/include/freetype/internal/fttrace.h diff --git a/drivers/freetype/freetype/include/freetype/internal/ftvalid.h b/drivers/freetype/include/freetype/internal/ftvalid.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/ftvalid.h rename to drivers/freetype/include/freetype/internal/ftvalid.h diff --git a/drivers/freetype/freetype/include/freetype/internal/internal.h b/drivers/freetype/include/freetype/internal/internal.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/internal.h rename to drivers/freetype/include/freetype/internal/internal.h diff --git a/drivers/freetype/freetype/include/freetype/internal/psaux.h b/drivers/freetype/include/freetype/internal/psaux.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/psaux.h rename to drivers/freetype/include/freetype/internal/psaux.h diff --git a/drivers/freetype/freetype/include/freetype/internal/pshints.h b/drivers/freetype/include/freetype/internal/pshints.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/pshints.h rename to drivers/freetype/include/freetype/internal/pshints.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svbdf.h b/drivers/freetype/include/freetype/internal/services/svbdf.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svbdf.h rename to drivers/freetype/include/freetype/internal/services/svbdf.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svcid.h b/drivers/freetype/include/freetype/internal/services/svcid.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svcid.h rename to drivers/freetype/include/freetype/internal/services/svcid.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svgldict.h b/drivers/freetype/include/freetype/internal/services/svgldict.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svgldict.h rename to drivers/freetype/include/freetype/internal/services/svgldict.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svgxval.h b/drivers/freetype/include/freetype/internal/services/svgxval.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svgxval.h rename to drivers/freetype/include/freetype/internal/services/svgxval.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svkern.h b/drivers/freetype/include/freetype/internal/services/svkern.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svkern.h rename to drivers/freetype/include/freetype/internal/services/svkern.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svmm.h b/drivers/freetype/include/freetype/internal/services/svmm.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svmm.h rename to drivers/freetype/include/freetype/internal/services/svmm.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svotval.h b/drivers/freetype/include/freetype/internal/services/svotval.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svotval.h rename to drivers/freetype/include/freetype/internal/services/svotval.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svpfr.h b/drivers/freetype/include/freetype/internal/services/svpfr.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svpfr.h rename to drivers/freetype/include/freetype/internal/services/svpfr.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svpostnm.h b/drivers/freetype/include/freetype/internal/services/svpostnm.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svpostnm.h rename to drivers/freetype/include/freetype/internal/services/svpostnm.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svprop.h b/drivers/freetype/include/freetype/internal/services/svprop.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svprop.h rename to drivers/freetype/include/freetype/internal/services/svprop.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svpscmap.h b/drivers/freetype/include/freetype/internal/services/svpscmap.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svpscmap.h rename to drivers/freetype/include/freetype/internal/services/svpscmap.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svpsinfo.h b/drivers/freetype/include/freetype/internal/services/svpsinfo.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svpsinfo.h rename to drivers/freetype/include/freetype/internal/services/svpsinfo.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svsfnt.h b/drivers/freetype/include/freetype/internal/services/svsfnt.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svsfnt.h rename to drivers/freetype/include/freetype/internal/services/svsfnt.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svttcmap.h b/drivers/freetype/include/freetype/internal/services/svttcmap.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svttcmap.h rename to drivers/freetype/include/freetype/internal/services/svttcmap.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svtteng.h b/drivers/freetype/include/freetype/internal/services/svtteng.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svtteng.h rename to drivers/freetype/include/freetype/internal/services/svtteng.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svttglyf.h b/drivers/freetype/include/freetype/internal/services/svttglyf.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svttglyf.h rename to drivers/freetype/include/freetype/internal/services/svttglyf.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svwinfnt.h b/drivers/freetype/include/freetype/internal/services/svwinfnt.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svwinfnt.h rename to drivers/freetype/include/freetype/internal/services/svwinfnt.h diff --git a/drivers/freetype/freetype/include/freetype/internal/services/svxf86nm.h b/drivers/freetype/include/freetype/internal/services/svxf86nm.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/services/svxf86nm.h rename to drivers/freetype/include/freetype/internal/services/svxf86nm.h diff --git a/drivers/freetype/freetype/include/freetype/internal/sfnt.h b/drivers/freetype/include/freetype/internal/sfnt.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/sfnt.h rename to drivers/freetype/include/freetype/internal/sfnt.h diff --git a/drivers/freetype/freetype/include/freetype/internal/t1types.h b/drivers/freetype/include/freetype/internal/t1types.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/t1types.h rename to drivers/freetype/include/freetype/internal/t1types.h diff --git a/drivers/freetype/freetype/include/freetype/internal/tttypes.h b/drivers/freetype/include/freetype/internal/tttypes.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/internal/tttypes.h rename to drivers/freetype/include/freetype/internal/tttypes.h diff --git a/drivers/freetype/freetype/include/freetype/t1tables.h b/drivers/freetype/include/freetype/t1tables.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/t1tables.h rename to drivers/freetype/include/freetype/t1tables.h diff --git a/drivers/freetype/freetype/include/freetype/ttnameid.h b/drivers/freetype/include/freetype/ttnameid.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ttnameid.h rename to drivers/freetype/include/freetype/ttnameid.h diff --git a/drivers/freetype/freetype/include/freetype/tttables.h b/drivers/freetype/include/freetype/tttables.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/tttables.h rename to drivers/freetype/include/freetype/tttables.h diff --git a/drivers/freetype/freetype/include/freetype/tttags.h b/drivers/freetype/include/freetype/tttags.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/tttags.h rename to drivers/freetype/include/freetype/tttags.h diff --git a/drivers/freetype/freetype/include/freetype/ttunpat.h b/drivers/freetype/include/freetype/ttunpat.h similarity index 100% rename from drivers/freetype/freetype/include/freetype/ttunpat.h rename to drivers/freetype/include/freetype/ttunpat.h diff --git a/drivers/freetype/freetype/include/ft2build.h b/drivers/freetype/include/ft2build.h similarity index 100% rename from drivers/freetype/freetype/include/ft2build.h rename to drivers/freetype/include/ft2build.h diff --git a/drivers/freetype/freetype/src/Jamfile b/drivers/freetype/src/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/Jamfile rename to drivers/freetype/src/Jamfile diff --git a/drivers/freetype/freetype/src/autofit/Jamfile b/drivers/freetype/src/autofit/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/autofit/Jamfile rename to drivers/freetype/src/autofit/Jamfile diff --git a/drivers/freetype/freetype/src/autofit/afangles.c b/drivers/freetype/src/autofit/afangles.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afangles.c rename to drivers/freetype/src/autofit/afangles.c diff --git a/drivers/freetype/freetype/src/autofit/afangles.h b/drivers/freetype/src/autofit/afangles.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afangles.h rename to drivers/freetype/src/autofit/afangles.h diff --git a/drivers/freetype/freetype/src/autofit/afcjk.c b/drivers/freetype/src/autofit/afcjk.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afcjk.c rename to drivers/freetype/src/autofit/afcjk.c diff --git a/drivers/freetype/freetype/src/autofit/afcjk.h b/drivers/freetype/src/autofit/afcjk.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afcjk.h rename to drivers/freetype/src/autofit/afcjk.h diff --git a/drivers/freetype/freetype/src/autofit/afdummy.c b/drivers/freetype/src/autofit/afdummy.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afdummy.c rename to drivers/freetype/src/autofit/afdummy.c diff --git a/drivers/freetype/freetype/src/autofit/afdummy.h b/drivers/freetype/src/autofit/afdummy.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afdummy.h rename to drivers/freetype/src/autofit/afdummy.h diff --git a/drivers/freetype/freetype/src/autofit/aferrors.h b/drivers/freetype/src/autofit/aferrors.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/aferrors.h rename to drivers/freetype/src/autofit/aferrors.h diff --git a/drivers/freetype/freetype/src/autofit/afglobal.c b/drivers/freetype/src/autofit/afglobal.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afglobal.c rename to drivers/freetype/src/autofit/afglobal.c diff --git a/drivers/freetype/freetype/src/autofit/afglobal.h b/drivers/freetype/src/autofit/afglobal.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afglobal.h rename to drivers/freetype/src/autofit/afglobal.h diff --git a/drivers/freetype/freetype/src/autofit/afhints.c b/drivers/freetype/src/autofit/afhints.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afhints.c rename to drivers/freetype/src/autofit/afhints.c diff --git a/drivers/freetype/freetype/src/autofit/afhints.h b/drivers/freetype/src/autofit/afhints.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afhints.h rename to drivers/freetype/src/autofit/afhints.h diff --git a/drivers/freetype/freetype/src/autofit/afindic.c b/drivers/freetype/src/autofit/afindic.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afindic.c rename to drivers/freetype/src/autofit/afindic.c diff --git a/drivers/freetype/freetype/src/autofit/afindic.h b/drivers/freetype/src/autofit/afindic.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afindic.h rename to drivers/freetype/src/autofit/afindic.h diff --git a/drivers/freetype/freetype/src/autofit/aflatin.c b/drivers/freetype/src/autofit/aflatin.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/aflatin.c rename to drivers/freetype/src/autofit/aflatin.c diff --git a/drivers/freetype/freetype/src/autofit/aflatin.h b/drivers/freetype/src/autofit/aflatin.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/aflatin.h rename to drivers/freetype/src/autofit/aflatin.h diff --git a/drivers/freetype/freetype/src/autofit/aflatin2.c b/drivers/freetype/src/autofit/aflatin2.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/aflatin2.c rename to drivers/freetype/src/autofit/aflatin2.c diff --git a/drivers/freetype/freetype/src/autofit/aflatin2.h b/drivers/freetype/src/autofit/aflatin2.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/aflatin2.h rename to drivers/freetype/src/autofit/aflatin2.h diff --git a/drivers/freetype/freetype/src/autofit/afloader.c b/drivers/freetype/src/autofit/afloader.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afloader.c rename to drivers/freetype/src/autofit/afloader.c diff --git a/drivers/freetype/freetype/src/autofit/afloader.h b/drivers/freetype/src/autofit/afloader.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afloader.h rename to drivers/freetype/src/autofit/afloader.h diff --git a/drivers/freetype/freetype/src/autofit/afmodule.c b/drivers/freetype/src/autofit/afmodule.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afmodule.c rename to drivers/freetype/src/autofit/afmodule.c diff --git a/drivers/freetype/freetype/src/autofit/afmodule.h b/drivers/freetype/src/autofit/afmodule.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afmodule.h rename to drivers/freetype/src/autofit/afmodule.h diff --git a/drivers/freetype/freetype/src/autofit/afpic.c b/drivers/freetype/src/autofit/afpic.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afpic.c rename to drivers/freetype/src/autofit/afpic.c diff --git a/drivers/freetype/freetype/src/autofit/afpic.h b/drivers/freetype/src/autofit/afpic.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afpic.h rename to drivers/freetype/src/autofit/afpic.h diff --git a/drivers/freetype/freetype/src/autofit/aftypes.h b/drivers/freetype/src/autofit/aftypes.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/aftypes.h rename to drivers/freetype/src/autofit/aftypes.h diff --git a/drivers/freetype/freetype/src/autofit/afwarp.c b/drivers/freetype/src/autofit/afwarp.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/afwarp.c rename to drivers/freetype/src/autofit/afwarp.c diff --git a/drivers/freetype/freetype/src/autofit/afwarp.h b/drivers/freetype/src/autofit/afwarp.h similarity index 100% rename from drivers/freetype/freetype/src/autofit/afwarp.h rename to drivers/freetype/src/autofit/afwarp.h diff --git a/drivers/freetype/freetype/src/autofit/autofit.c b/drivers/freetype/src/autofit/autofit.c similarity index 100% rename from drivers/freetype/freetype/src/autofit/autofit.c rename to drivers/freetype/src/autofit/autofit.c diff --git a/drivers/freetype/freetype/src/autofit/module.mk b/drivers/freetype/src/autofit/module.mk similarity index 100% rename from drivers/freetype/freetype/src/autofit/module.mk rename to drivers/freetype/src/autofit/module.mk diff --git a/drivers/freetype/freetype/src/autofit/rules.mk b/drivers/freetype/src/autofit/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/autofit/rules.mk rename to drivers/freetype/src/autofit/rules.mk diff --git a/drivers/freetype/freetype/src/base/Jamfile b/drivers/freetype/src/base/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/base/Jamfile rename to drivers/freetype/src/base/Jamfile diff --git a/drivers/freetype/freetype/src/base/basepic.c b/drivers/freetype/src/base/basepic.c similarity index 100% rename from drivers/freetype/freetype/src/base/basepic.c rename to drivers/freetype/src/base/basepic.c diff --git a/drivers/freetype/freetype/src/base/basepic.h b/drivers/freetype/src/base/basepic.h similarity index 100% rename from drivers/freetype/freetype/src/base/basepic.h rename to drivers/freetype/src/base/basepic.h diff --git a/drivers/freetype/freetype/src/base/ftadvanc.c b/drivers/freetype/src/base/ftadvanc.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftadvanc.c rename to drivers/freetype/src/base/ftadvanc.c diff --git a/drivers/freetype/freetype/src/base/ftapi.c b/drivers/freetype/src/base/ftapi.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftapi.c rename to drivers/freetype/src/base/ftapi.c diff --git a/drivers/freetype/freetype/src/base/ftbase.c b/drivers/freetype/src/base/ftbase.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftbase.c rename to drivers/freetype/src/base/ftbase.c diff --git a/drivers/freetype/freetype/src/base/ftbase.h b/drivers/freetype/src/base/ftbase.h similarity index 100% rename from drivers/freetype/freetype/src/base/ftbase.h rename to drivers/freetype/src/base/ftbase.h diff --git a/drivers/freetype/freetype/src/base/ftbbox.c b/drivers/freetype/src/base/ftbbox.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftbbox.c rename to drivers/freetype/src/base/ftbbox.c diff --git a/drivers/freetype/freetype/src/base/ftbdf.c b/drivers/freetype/src/base/ftbdf.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftbdf.c rename to drivers/freetype/src/base/ftbdf.c diff --git a/drivers/freetype/freetype/src/base/ftbitmap.c b/drivers/freetype/src/base/ftbitmap.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftbitmap.c rename to drivers/freetype/src/base/ftbitmap.c diff --git a/drivers/freetype/freetype/src/base/ftcalc.c b/drivers/freetype/src/base/ftcalc.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftcalc.c rename to drivers/freetype/src/base/ftcalc.c diff --git a/drivers/freetype/freetype/src/base/ftcid.c b/drivers/freetype/src/base/ftcid.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftcid.c rename to drivers/freetype/src/base/ftcid.c diff --git a/drivers/freetype/freetype/src/base/ftdbgmem.c b/drivers/freetype/src/base/ftdbgmem.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftdbgmem.c rename to drivers/freetype/src/base/ftdbgmem.c diff --git a/drivers/freetype/freetype/src/base/ftdebug.c b/drivers/freetype/src/base/ftdebug.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftdebug.c rename to drivers/freetype/src/base/ftdebug.c diff --git a/drivers/freetype/freetype/src/base/ftfstype.c b/drivers/freetype/src/base/ftfstype.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftfstype.c rename to drivers/freetype/src/base/ftfstype.c diff --git a/drivers/freetype/freetype/src/base/ftgasp.c b/drivers/freetype/src/base/ftgasp.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftgasp.c rename to drivers/freetype/src/base/ftgasp.c diff --git a/drivers/freetype/freetype/src/base/ftgloadr.c b/drivers/freetype/src/base/ftgloadr.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftgloadr.c rename to drivers/freetype/src/base/ftgloadr.c diff --git a/drivers/freetype/freetype/src/base/ftglyph.c b/drivers/freetype/src/base/ftglyph.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftglyph.c rename to drivers/freetype/src/base/ftglyph.c diff --git a/drivers/freetype/freetype/src/base/ftgxval.c b/drivers/freetype/src/base/ftgxval.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftgxval.c rename to drivers/freetype/src/base/ftgxval.c diff --git a/drivers/freetype/freetype/src/base/ftinit.c b/drivers/freetype/src/base/ftinit.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftinit.c rename to drivers/freetype/src/base/ftinit.c diff --git a/drivers/freetype/freetype/src/base/ftlcdfil.c b/drivers/freetype/src/base/ftlcdfil.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftlcdfil.c rename to drivers/freetype/src/base/ftlcdfil.c diff --git a/drivers/freetype/freetype/src/base/ftmac.c b/drivers/freetype/src/base/ftmac.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftmac.c rename to drivers/freetype/src/base/ftmac.c diff --git a/drivers/freetype/freetype/src/base/ftmm.c b/drivers/freetype/src/base/ftmm.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftmm.c rename to drivers/freetype/src/base/ftmm.c diff --git a/drivers/freetype/freetype/src/base/ftobjs.c b/drivers/freetype/src/base/ftobjs.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftobjs.c rename to drivers/freetype/src/base/ftobjs.c diff --git a/drivers/freetype/freetype/src/base/ftotval.c b/drivers/freetype/src/base/ftotval.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftotval.c rename to drivers/freetype/src/base/ftotval.c diff --git a/drivers/freetype/freetype/src/base/ftoutln.c b/drivers/freetype/src/base/ftoutln.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftoutln.c rename to drivers/freetype/src/base/ftoutln.c diff --git a/drivers/freetype/freetype/src/base/ftpatent.c b/drivers/freetype/src/base/ftpatent.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftpatent.c rename to drivers/freetype/src/base/ftpatent.c diff --git a/drivers/freetype/freetype/src/base/ftpfr.c b/drivers/freetype/src/base/ftpfr.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftpfr.c rename to drivers/freetype/src/base/ftpfr.c diff --git a/drivers/freetype/freetype/src/base/ftpic.c b/drivers/freetype/src/base/ftpic.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftpic.c rename to drivers/freetype/src/base/ftpic.c diff --git a/drivers/freetype/freetype/src/base/ftrfork.c b/drivers/freetype/src/base/ftrfork.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftrfork.c rename to drivers/freetype/src/base/ftrfork.c diff --git a/drivers/freetype/freetype/src/base/ftsnames.c b/drivers/freetype/src/base/ftsnames.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftsnames.c rename to drivers/freetype/src/base/ftsnames.c diff --git a/drivers/freetype/freetype/src/base/ftstream.c b/drivers/freetype/src/base/ftstream.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftstream.c rename to drivers/freetype/src/base/ftstream.c diff --git a/drivers/freetype/freetype/src/base/ftstroke.c b/drivers/freetype/src/base/ftstroke.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftstroke.c rename to drivers/freetype/src/base/ftstroke.c diff --git a/drivers/freetype/freetype/src/base/ftsynth.c b/drivers/freetype/src/base/ftsynth.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftsynth.c rename to drivers/freetype/src/base/ftsynth.c diff --git a/drivers/freetype/freetype/src/base/ftsystem.c b/drivers/freetype/src/base/ftsystem.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftsystem.c rename to drivers/freetype/src/base/ftsystem.c diff --git a/drivers/freetype/freetype/src/base/fttrigon.c b/drivers/freetype/src/base/fttrigon.c similarity index 100% rename from drivers/freetype/freetype/src/base/fttrigon.c rename to drivers/freetype/src/base/fttrigon.c diff --git a/drivers/freetype/freetype/src/base/fttype1.c b/drivers/freetype/src/base/fttype1.c similarity index 100% rename from drivers/freetype/freetype/src/base/fttype1.c rename to drivers/freetype/src/base/fttype1.c diff --git a/drivers/freetype/freetype/src/base/ftutil.c b/drivers/freetype/src/base/ftutil.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftutil.c rename to drivers/freetype/src/base/ftutil.c diff --git a/drivers/freetype/freetype/src/base/ftwinfnt.c b/drivers/freetype/src/base/ftwinfnt.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftwinfnt.c rename to drivers/freetype/src/base/ftwinfnt.c diff --git a/drivers/freetype/freetype/src/base/ftxf86.c b/drivers/freetype/src/base/ftxf86.c similarity index 100% rename from drivers/freetype/freetype/src/base/ftxf86.c rename to drivers/freetype/src/base/ftxf86.c diff --git a/drivers/freetype/freetype/src/base/md5.c b/drivers/freetype/src/base/md5.c similarity index 100% rename from drivers/freetype/freetype/src/base/md5.c rename to drivers/freetype/src/base/md5.c diff --git a/drivers/freetype/freetype/src/base/md5.h b/drivers/freetype/src/base/md5.h similarity index 100% rename from drivers/freetype/freetype/src/base/md5.h rename to drivers/freetype/src/base/md5.h diff --git a/drivers/freetype/freetype/src/base/rules.mk b/drivers/freetype/src/base/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/base/rules.mk rename to drivers/freetype/src/base/rules.mk diff --git a/drivers/freetype/freetype/src/bdf/Jamfile b/drivers/freetype/src/bdf/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/bdf/Jamfile rename to drivers/freetype/src/bdf/Jamfile diff --git a/drivers/freetype/freetype/src/bdf/README b/drivers/freetype/src/bdf/README similarity index 100% rename from drivers/freetype/freetype/src/bdf/README rename to drivers/freetype/src/bdf/README diff --git a/drivers/freetype/freetype/src/bdf/bdf.c b/drivers/freetype/src/bdf/bdf.c similarity index 100% rename from drivers/freetype/freetype/src/bdf/bdf.c rename to drivers/freetype/src/bdf/bdf.c diff --git a/drivers/freetype/freetype/src/bdf/bdf.h b/drivers/freetype/src/bdf/bdf.h similarity index 100% rename from drivers/freetype/freetype/src/bdf/bdf.h rename to drivers/freetype/src/bdf/bdf.h diff --git a/drivers/freetype/freetype/src/bdf/bdfdrivr.c b/drivers/freetype/src/bdf/bdfdrivr.c similarity index 100% rename from drivers/freetype/freetype/src/bdf/bdfdrivr.c rename to drivers/freetype/src/bdf/bdfdrivr.c diff --git a/drivers/freetype/freetype/src/bdf/bdfdrivr.h b/drivers/freetype/src/bdf/bdfdrivr.h similarity index 100% rename from drivers/freetype/freetype/src/bdf/bdfdrivr.h rename to drivers/freetype/src/bdf/bdfdrivr.h diff --git a/drivers/freetype/freetype/src/bdf/bdferror.h b/drivers/freetype/src/bdf/bdferror.h similarity index 100% rename from drivers/freetype/freetype/src/bdf/bdferror.h rename to drivers/freetype/src/bdf/bdferror.h diff --git a/drivers/freetype/freetype/src/bdf/bdflib.c b/drivers/freetype/src/bdf/bdflib.c similarity index 100% rename from drivers/freetype/freetype/src/bdf/bdflib.c rename to drivers/freetype/src/bdf/bdflib.c diff --git a/drivers/freetype/freetype/src/bdf/module.mk b/drivers/freetype/src/bdf/module.mk similarity index 100% rename from drivers/freetype/freetype/src/bdf/module.mk rename to drivers/freetype/src/bdf/module.mk diff --git a/drivers/freetype/freetype/src/bdf/rules.mk b/drivers/freetype/src/bdf/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/bdf/rules.mk rename to drivers/freetype/src/bdf/rules.mk diff --git a/drivers/freetype/freetype/src/cache/Jamfile b/drivers/freetype/src/cache/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/cache/Jamfile rename to drivers/freetype/src/cache/Jamfile diff --git a/drivers/freetype/freetype/src/cache/ftcache.c b/drivers/freetype/src/cache/ftcache.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcache.c rename to drivers/freetype/src/cache/ftcache.c diff --git a/drivers/freetype/freetype/src/cache/ftcbasic.c b/drivers/freetype/src/cache/ftcbasic.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcbasic.c rename to drivers/freetype/src/cache/ftcbasic.c diff --git a/drivers/freetype/freetype/src/cache/ftccache.c b/drivers/freetype/src/cache/ftccache.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftccache.c rename to drivers/freetype/src/cache/ftccache.c diff --git a/drivers/freetype/freetype/src/cache/ftccache.h b/drivers/freetype/src/cache/ftccache.h similarity index 100% rename from drivers/freetype/freetype/src/cache/ftccache.h rename to drivers/freetype/src/cache/ftccache.h diff --git a/drivers/freetype/freetype/src/cache/ftccback.h b/drivers/freetype/src/cache/ftccback.h similarity index 100% rename from drivers/freetype/freetype/src/cache/ftccback.h rename to drivers/freetype/src/cache/ftccback.h diff --git a/drivers/freetype/freetype/src/cache/ftccmap.c b/drivers/freetype/src/cache/ftccmap.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftccmap.c rename to drivers/freetype/src/cache/ftccmap.c diff --git a/drivers/freetype/freetype/src/cache/ftcerror.h b/drivers/freetype/src/cache/ftcerror.h similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcerror.h rename to drivers/freetype/src/cache/ftcerror.h diff --git a/drivers/freetype/freetype/src/cache/ftcglyph.c b/drivers/freetype/src/cache/ftcglyph.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcglyph.c rename to drivers/freetype/src/cache/ftcglyph.c diff --git a/drivers/freetype/freetype/src/cache/ftcglyph.h b/drivers/freetype/src/cache/ftcglyph.h similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcglyph.h rename to drivers/freetype/src/cache/ftcglyph.h diff --git a/drivers/freetype/freetype/src/cache/ftcimage.c b/drivers/freetype/src/cache/ftcimage.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcimage.c rename to drivers/freetype/src/cache/ftcimage.c diff --git a/drivers/freetype/freetype/src/cache/ftcimage.h b/drivers/freetype/src/cache/ftcimage.h similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcimage.h rename to drivers/freetype/src/cache/ftcimage.h diff --git a/drivers/freetype/freetype/src/cache/ftcmanag.c b/drivers/freetype/src/cache/ftcmanag.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcmanag.c rename to drivers/freetype/src/cache/ftcmanag.c diff --git a/drivers/freetype/freetype/src/cache/ftcmanag.h b/drivers/freetype/src/cache/ftcmanag.h similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcmanag.h rename to drivers/freetype/src/cache/ftcmanag.h diff --git a/drivers/freetype/freetype/src/cache/ftcmru.c b/drivers/freetype/src/cache/ftcmru.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcmru.c rename to drivers/freetype/src/cache/ftcmru.c diff --git a/drivers/freetype/freetype/src/cache/ftcmru.h b/drivers/freetype/src/cache/ftcmru.h similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcmru.h rename to drivers/freetype/src/cache/ftcmru.h diff --git a/drivers/freetype/freetype/src/cache/ftcsbits.c b/drivers/freetype/src/cache/ftcsbits.c similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcsbits.c rename to drivers/freetype/src/cache/ftcsbits.c diff --git a/drivers/freetype/freetype/src/cache/ftcsbits.h b/drivers/freetype/src/cache/ftcsbits.h similarity index 100% rename from drivers/freetype/freetype/src/cache/ftcsbits.h rename to drivers/freetype/src/cache/ftcsbits.h diff --git a/drivers/freetype/freetype/src/cache/rules.mk b/drivers/freetype/src/cache/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/cache/rules.mk rename to drivers/freetype/src/cache/rules.mk diff --git a/drivers/freetype/freetype/src/cff/Jamfile b/drivers/freetype/src/cff/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/cff/Jamfile rename to drivers/freetype/src/cff/Jamfile diff --git a/drivers/freetype/freetype/src/cff/cf2arrst.c b/drivers/freetype/src/cff/cf2arrst.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2arrst.c rename to drivers/freetype/src/cff/cf2arrst.c diff --git a/drivers/freetype/freetype/src/cff/cf2arrst.h b/drivers/freetype/src/cff/cf2arrst.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2arrst.h rename to drivers/freetype/src/cff/cf2arrst.h diff --git a/drivers/freetype/freetype/src/cff/cf2blues.c b/drivers/freetype/src/cff/cf2blues.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2blues.c rename to drivers/freetype/src/cff/cf2blues.c diff --git a/drivers/freetype/freetype/src/cff/cf2blues.h b/drivers/freetype/src/cff/cf2blues.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2blues.h rename to drivers/freetype/src/cff/cf2blues.h diff --git a/drivers/freetype/freetype/src/cff/cf2error.c b/drivers/freetype/src/cff/cf2error.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2error.c rename to drivers/freetype/src/cff/cf2error.c diff --git a/drivers/freetype/freetype/src/cff/cf2error.h b/drivers/freetype/src/cff/cf2error.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2error.h rename to drivers/freetype/src/cff/cf2error.h diff --git a/drivers/freetype/freetype/src/cff/cf2fixed.h b/drivers/freetype/src/cff/cf2fixed.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2fixed.h rename to drivers/freetype/src/cff/cf2fixed.h diff --git a/drivers/freetype/freetype/src/cff/cf2font.c b/drivers/freetype/src/cff/cf2font.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2font.c rename to drivers/freetype/src/cff/cf2font.c diff --git a/drivers/freetype/freetype/src/cff/cf2font.h b/drivers/freetype/src/cff/cf2font.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2font.h rename to drivers/freetype/src/cff/cf2font.h diff --git a/drivers/freetype/freetype/src/cff/cf2ft.c b/drivers/freetype/src/cff/cf2ft.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2ft.c rename to drivers/freetype/src/cff/cf2ft.c diff --git a/drivers/freetype/freetype/src/cff/cf2ft.h b/drivers/freetype/src/cff/cf2ft.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2ft.h rename to drivers/freetype/src/cff/cf2ft.h diff --git a/drivers/freetype/freetype/src/cff/cf2glue.h b/drivers/freetype/src/cff/cf2glue.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2glue.h rename to drivers/freetype/src/cff/cf2glue.h diff --git a/drivers/freetype/freetype/src/cff/cf2hints.c b/drivers/freetype/src/cff/cf2hints.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2hints.c rename to drivers/freetype/src/cff/cf2hints.c diff --git a/drivers/freetype/freetype/src/cff/cf2hints.h b/drivers/freetype/src/cff/cf2hints.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2hints.h rename to drivers/freetype/src/cff/cf2hints.h diff --git a/drivers/freetype/freetype/src/cff/cf2intrp.c b/drivers/freetype/src/cff/cf2intrp.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2intrp.c rename to drivers/freetype/src/cff/cf2intrp.c diff --git a/drivers/freetype/freetype/src/cff/cf2intrp.h b/drivers/freetype/src/cff/cf2intrp.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2intrp.h rename to drivers/freetype/src/cff/cf2intrp.h diff --git a/drivers/freetype/freetype/src/cff/cf2read.c b/drivers/freetype/src/cff/cf2read.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2read.c rename to drivers/freetype/src/cff/cf2read.c diff --git a/drivers/freetype/freetype/src/cff/cf2read.h b/drivers/freetype/src/cff/cf2read.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2read.h rename to drivers/freetype/src/cff/cf2read.h diff --git a/drivers/freetype/freetype/src/cff/cf2stack.c b/drivers/freetype/src/cff/cf2stack.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2stack.c rename to drivers/freetype/src/cff/cf2stack.c diff --git a/drivers/freetype/freetype/src/cff/cf2stack.h b/drivers/freetype/src/cff/cf2stack.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2stack.h rename to drivers/freetype/src/cff/cf2stack.h diff --git a/drivers/freetype/freetype/src/cff/cf2types.h b/drivers/freetype/src/cff/cf2types.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cf2types.h rename to drivers/freetype/src/cff/cf2types.h diff --git a/drivers/freetype/freetype/src/cff/cff.c b/drivers/freetype/src/cff/cff.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cff.c rename to drivers/freetype/src/cff/cff.c diff --git a/drivers/freetype/freetype/src/cff/cffcmap.c b/drivers/freetype/src/cff/cffcmap.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cffcmap.c rename to drivers/freetype/src/cff/cffcmap.c diff --git a/drivers/freetype/freetype/src/cff/cffcmap.h b/drivers/freetype/src/cff/cffcmap.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cffcmap.h rename to drivers/freetype/src/cff/cffcmap.h diff --git a/drivers/freetype/freetype/src/cff/cffdrivr.c b/drivers/freetype/src/cff/cffdrivr.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cffdrivr.c rename to drivers/freetype/src/cff/cffdrivr.c diff --git a/drivers/freetype/freetype/src/cff/cffdrivr.h b/drivers/freetype/src/cff/cffdrivr.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cffdrivr.h rename to drivers/freetype/src/cff/cffdrivr.h diff --git a/drivers/freetype/freetype/src/cff/cfferrs.h b/drivers/freetype/src/cff/cfferrs.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cfferrs.h rename to drivers/freetype/src/cff/cfferrs.h diff --git a/drivers/freetype/freetype/src/cff/cffgload.c b/drivers/freetype/src/cff/cffgload.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cffgload.c rename to drivers/freetype/src/cff/cffgload.c diff --git a/drivers/freetype/freetype/src/cff/cffgload.h b/drivers/freetype/src/cff/cffgload.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cffgload.h rename to drivers/freetype/src/cff/cffgload.h diff --git a/drivers/freetype/freetype/src/cff/cffload.c b/drivers/freetype/src/cff/cffload.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cffload.c rename to drivers/freetype/src/cff/cffload.c diff --git a/drivers/freetype/freetype/src/cff/cffload.h b/drivers/freetype/src/cff/cffload.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cffload.h rename to drivers/freetype/src/cff/cffload.h diff --git a/drivers/freetype/freetype/src/cff/cffobjs.c b/drivers/freetype/src/cff/cffobjs.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cffobjs.c rename to drivers/freetype/src/cff/cffobjs.c diff --git a/drivers/freetype/freetype/src/cff/cffobjs.h b/drivers/freetype/src/cff/cffobjs.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cffobjs.h rename to drivers/freetype/src/cff/cffobjs.h diff --git a/drivers/freetype/freetype/src/cff/cffparse.c b/drivers/freetype/src/cff/cffparse.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cffparse.c rename to drivers/freetype/src/cff/cffparse.c diff --git a/drivers/freetype/freetype/src/cff/cffparse.h b/drivers/freetype/src/cff/cffparse.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cffparse.h rename to drivers/freetype/src/cff/cffparse.h diff --git a/drivers/freetype/freetype/src/cff/cffpic.c b/drivers/freetype/src/cff/cffpic.c similarity index 100% rename from drivers/freetype/freetype/src/cff/cffpic.c rename to drivers/freetype/src/cff/cffpic.c diff --git a/drivers/freetype/freetype/src/cff/cffpic.h b/drivers/freetype/src/cff/cffpic.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cffpic.h rename to drivers/freetype/src/cff/cffpic.h diff --git a/drivers/freetype/freetype/src/cff/cfftoken.h b/drivers/freetype/src/cff/cfftoken.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cfftoken.h rename to drivers/freetype/src/cff/cfftoken.h diff --git a/drivers/freetype/freetype/src/cff/cfftypes.h b/drivers/freetype/src/cff/cfftypes.h similarity index 100% rename from drivers/freetype/freetype/src/cff/cfftypes.h rename to drivers/freetype/src/cff/cfftypes.h diff --git a/drivers/freetype/freetype/src/cff/module.mk b/drivers/freetype/src/cff/module.mk similarity index 100% rename from drivers/freetype/freetype/src/cff/module.mk rename to drivers/freetype/src/cff/module.mk diff --git a/drivers/freetype/freetype/src/cff/rules.mk b/drivers/freetype/src/cff/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/cff/rules.mk rename to drivers/freetype/src/cff/rules.mk diff --git a/drivers/freetype/freetype/src/cid/Jamfile b/drivers/freetype/src/cid/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/cid/Jamfile rename to drivers/freetype/src/cid/Jamfile diff --git a/drivers/freetype/freetype/src/cid/ciderrs.h b/drivers/freetype/src/cid/ciderrs.h similarity index 100% rename from drivers/freetype/freetype/src/cid/ciderrs.h rename to drivers/freetype/src/cid/ciderrs.h diff --git a/drivers/freetype/freetype/src/cid/cidgload.c b/drivers/freetype/src/cid/cidgload.c similarity index 100% rename from drivers/freetype/freetype/src/cid/cidgload.c rename to drivers/freetype/src/cid/cidgload.c diff --git a/drivers/freetype/freetype/src/cid/cidgload.h b/drivers/freetype/src/cid/cidgload.h similarity index 100% rename from drivers/freetype/freetype/src/cid/cidgload.h rename to drivers/freetype/src/cid/cidgload.h diff --git a/drivers/freetype/freetype/src/cid/cidload.c b/drivers/freetype/src/cid/cidload.c similarity index 100% rename from drivers/freetype/freetype/src/cid/cidload.c rename to drivers/freetype/src/cid/cidload.c diff --git a/drivers/freetype/freetype/src/cid/cidload.h b/drivers/freetype/src/cid/cidload.h similarity index 100% rename from drivers/freetype/freetype/src/cid/cidload.h rename to drivers/freetype/src/cid/cidload.h diff --git a/drivers/freetype/freetype/src/cid/cidobjs.c b/drivers/freetype/src/cid/cidobjs.c similarity index 100% rename from drivers/freetype/freetype/src/cid/cidobjs.c rename to drivers/freetype/src/cid/cidobjs.c diff --git a/drivers/freetype/freetype/src/cid/cidobjs.h b/drivers/freetype/src/cid/cidobjs.h similarity index 100% rename from drivers/freetype/freetype/src/cid/cidobjs.h rename to drivers/freetype/src/cid/cidobjs.h diff --git a/drivers/freetype/freetype/src/cid/cidparse.c b/drivers/freetype/src/cid/cidparse.c similarity index 100% rename from drivers/freetype/freetype/src/cid/cidparse.c rename to drivers/freetype/src/cid/cidparse.c diff --git a/drivers/freetype/freetype/src/cid/cidparse.h b/drivers/freetype/src/cid/cidparse.h similarity index 100% rename from drivers/freetype/freetype/src/cid/cidparse.h rename to drivers/freetype/src/cid/cidparse.h diff --git a/drivers/freetype/freetype/src/cid/cidriver.c b/drivers/freetype/src/cid/cidriver.c similarity index 100% rename from drivers/freetype/freetype/src/cid/cidriver.c rename to drivers/freetype/src/cid/cidriver.c diff --git a/drivers/freetype/freetype/src/cid/cidriver.h b/drivers/freetype/src/cid/cidriver.h similarity index 100% rename from drivers/freetype/freetype/src/cid/cidriver.h rename to drivers/freetype/src/cid/cidriver.h diff --git a/drivers/freetype/freetype/src/cid/cidtoken.h b/drivers/freetype/src/cid/cidtoken.h similarity index 100% rename from drivers/freetype/freetype/src/cid/cidtoken.h rename to drivers/freetype/src/cid/cidtoken.h diff --git a/drivers/freetype/freetype/src/cid/module.mk b/drivers/freetype/src/cid/module.mk similarity index 100% rename from drivers/freetype/freetype/src/cid/module.mk rename to drivers/freetype/src/cid/module.mk diff --git a/drivers/freetype/freetype/src/cid/rules.mk b/drivers/freetype/src/cid/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/cid/rules.mk rename to drivers/freetype/src/cid/rules.mk diff --git a/drivers/freetype/freetype/src/cid/type1cid.c b/drivers/freetype/src/cid/type1cid.c similarity index 100% rename from drivers/freetype/freetype/src/cid/type1cid.c rename to drivers/freetype/src/cid/type1cid.c diff --git a/drivers/freetype/freetype/src/gxvalid/Jamfile b/drivers/freetype/src/gxvalid/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/Jamfile rename to drivers/freetype/src/gxvalid/Jamfile diff --git a/drivers/freetype/freetype/src/gxvalid/README b/drivers/freetype/src/gxvalid/README similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/README rename to drivers/freetype/src/gxvalid/README diff --git a/drivers/freetype/freetype/src/gxvalid/gxvalid.c b/drivers/freetype/src/gxvalid/gxvalid.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvalid.c rename to drivers/freetype/src/gxvalid/gxvalid.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvalid.h b/drivers/freetype/src/gxvalid/gxvalid.h similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvalid.h rename to drivers/freetype/src/gxvalid/gxvalid.h diff --git a/drivers/freetype/freetype/src/gxvalid/gxvbsln.c b/drivers/freetype/src/gxvalid/gxvbsln.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvbsln.c rename to drivers/freetype/src/gxvalid/gxvbsln.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvcommn.c b/drivers/freetype/src/gxvalid/gxvcommn.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvcommn.c rename to drivers/freetype/src/gxvalid/gxvcommn.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvcommn.h b/drivers/freetype/src/gxvalid/gxvcommn.h similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvcommn.h rename to drivers/freetype/src/gxvalid/gxvcommn.h diff --git a/drivers/freetype/freetype/src/gxvalid/gxverror.h b/drivers/freetype/src/gxvalid/gxverror.h similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxverror.h rename to drivers/freetype/src/gxvalid/gxverror.h diff --git a/drivers/freetype/freetype/src/gxvalid/gxvfeat.c b/drivers/freetype/src/gxvalid/gxvfeat.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvfeat.c rename to drivers/freetype/src/gxvalid/gxvfeat.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvfeat.h b/drivers/freetype/src/gxvalid/gxvfeat.h similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvfeat.h rename to drivers/freetype/src/gxvalid/gxvfeat.h diff --git a/drivers/freetype/freetype/src/gxvalid/gxvfgen.c b/drivers/freetype/src/gxvalid/gxvfgen.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvfgen.c rename to drivers/freetype/src/gxvalid/gxvfgen.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvjust.c b/drivers/freetype/src/gxvalid/gxvjust.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvjust.c rename to drivers/freetype/src/gxvalid/gxvjust.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvkern.c b/drivers/freetype/src/gxvalid/gxvkern.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvkern.c rename to drivers/freetype/src/gxvalid/gxvkern.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvlcar.c b/drivers/freetype/src/gxvalid/gxvlcar.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvlcar.c rename to drivers/freetype/src/gxvalid/gxvlcar.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmod.c b/drivers/freetype/src/gxvalid/gxvmod.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmod.c rename to drivers/freetype/src/gxvalid/gxvmod.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmod.h b/drivers/freetype/src/gxvalid/gxvmod.h similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmod.h rename to drivers/freetype/src/gxvalid/gxvmod.h diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmort.c b/drivers/freetype/src/gxvalid/gxvmort.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmort.c rename to drivers/freetype/src/gxvalid/gxvmort.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmort.h b/drivers/freetype/src/gxvalid/gxvmort.h similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmort.h rename to drivers/freetype/src/gxvalid/gxvmort.h diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmort0.c b/drivers/freetype/src/gxvalid/gxvmort0.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmort0.c rename to drivers/freetype/src/gxvalid/gxvmort0.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmort1.c b/drivers/freetype/src/gxvalid/gxvmort1.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmort1.c rename to drivers/freetype/src/gxvalid/gxvmort1.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmort2.c b/drivers/freetype/src/gxvalid/gxvmort2.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmort2.c rename to drivers/freetype/src/gxvalid/gxvmort2.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmort4.c b/drivers/freetype/src/gxvalid/gxvmort4.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmort4.c rename to drivers/freetype/src/gxvalid/gxvmort4.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmort5.c b/drivers/freetype/src/gxvalid/gxvmort5.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmort5.c rename to drivers/freetype/src/gxvalid/gxvmort5.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmorx.c b/drivers/freetype/src/gxvalid/gxvmorx.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmorx.c rename to drivers/freetype/src/gxvalid/gxvmorx.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmorx.h b/drivers/freetype/src/gxvalid/gxvmorx.h similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmorx.h rename to drivers/freetype/src/gxvalid/gxvmorx.h diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmorx0.c b/drivers/freetype/src/gxvalid/gxvmorx0.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmorx0.c rename to drivers/freetype/src/gxvalid/gxvmorx0.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmorx1.c b/drivers/freetype/src/gxvalid/gxvmorx1.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmorx1.c rename to drivers/freetype/src/gxvalid/gxvmorx1.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmorx2.c b/drivers/freetype/src/gxvalid/gxvmorx2.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmorx2.c rename to drivers/freetype/src/gxvalid/gxvmorx2.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmorx4.c b/drivers/freetype/src/gxvalid/gxvmorx4.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmorx4.c rename to drivers/freetype/src/gxvalid/gxvmorx4.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvmorx5.c b/drivers/freetype/src/gxvalid/gxvmorx5.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvmorx5.c rename to drivers/freetype/src/gxvalid/gxvmorx5.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvopbd.c b/drivers/freetype/src/gxvalid/gxvopbd.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvopbd.c rename to drivers/freetype/src/gxvalid/gxvopbd.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvprop.c b/drivers/freetype/src/gxvalid/gxvprop.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvprop.c rename to drivers/freetype/src/gxvalid/gxvprop.c diff --git a/drivers/freetype/freetype/src/gxvalid/gxvtrak.c b/drivers/freetype/src/gxvalid/gxvtrak.c similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/gxvtrak.c rename to drivers/freetype/src/gxvalid/gxvtrak.c diff --git a/drivers/freetype/freetype/src/gxvalid/module.mk b/drivers/freetype/src/gxvalid/module.mk similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/module.mk rename to drivers/freetype/src/gxvalid/module.mk diff --git a/drivers/freetype/freetype/src/gxvalid/rules.mk b/drivers/freetype/src/gxvalid/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/gxvalid/rules.mk rename to drivers/freetype/src/gxvalid/rules.mk diff --git a/drivers/freetype/freetype/src/otvalid/Jamfile b/drivers/freetype/src/otvalid/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/otvalid/Jamfile rename to drivers/freetype/src/otvalid/Jamfile diff --git a/drivers/freetype/freetype/src/otvalid/module.mk b/drivers/freetype/src/otvalid/module.mk similarity index 100% rename from drivers/freetype/freetype/src/otvalid/module.mk rename to drivers/freetype/src/otvalid/module.mk diff --git a/drivers/freetype/freetype/src/otvalid/otvalid.c b/drivers/freetype/src/otvalid/otvalid.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvalid.c rename to drivers/freetype/src/otvalid/otvalid.c diff --git a/drivers/freetype/freetype/src/otvalid/otvalid.h b/drivers/freetype/src/otvalid/otvalid.h similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvalid.h rename to drivers/freetype/src/otvalid/otvalid.h diff --git a/drivers/freetype/freetype/src/otvalid/otvbase.c b/drivers/freetype/src/otvalid/otvbase.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvbase.c rename to drivers/freetype/src/otvalid/otvbase.c diff --git a/drivers/freetype/freetype/src/otvalid/otvcommn.c b/drivers/freetype/src/otvalid/otvcommn.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvcommn.c rename to drivers/freetype/src/otvalid/otvcommn.c diff --git a/drivers/freetype/freetype/src/otvalid/otvcommn.h b/drivers/freetype/src/otvalid/otvcommn.h similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvcommn.h rename to drivers/freetype/src/otvalid/otvcommn.h diff --git a/drivers/freetype/freetype/src/otvalid/otverror.h b/drivers/freetype/src/otvalid/otverror.h similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otverror.h rename to drivers/freetype/src/otvalid/otverror.h diff --git a/drivers/freetype/freetype/src/otvalid/otvgdef.c b/drivers/freetype/src/otvalid/otvgdef.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvgdef.c rename to drivers/freetype/src/otvalid/otvgdef.c diff --git a/drivers/freetype/freetype/src/otvalid/otvgpos.c b/drivers/freetype/src/otvalid/otvgpos.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvgpos.c rename to drivers/freetype/src/otvalid/otvgpos.c diff --git a/drivers/freetype/freetype/src/otvalid/otvgpos.h b/drivers/freetype/src/otvalid/otvgpos.h similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvgpos.h rename to drivers/freetype/src/otvalid/otvgpos.h diff --git a/drivers/freetype/freetype/src/otvalid/otvgsub.c b/drivers/freetype/src/otvalid/otvgsub.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvgsub.c rename to drivers/freetype/src/otvalid/otvgsub.c diff --git a/drivers/freetype/freetype/src/otvalid/otvjstf.c b/drivers/freetype/src/otvalid/otvjstf.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvjstf.c rename to drivers/freetype/src/otvalid/otvjstf.c diff --git a/drivers/freetype/freetype/src/otvalid/otvmath.c b/drivers/freetype/src/otvalid/otvmath.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvmath.c rename to drivers/freetype/src/otvalid/otvmath.c diff --git a/drivers/freetype/freetype/src/otvalid/otvmod.c b/drivers/freetype/src/otvalid/otvmod.c similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvmod.c rename to drivers/freetype/src/otvalid/otvmod.c diff --git a/drivers/freetype/freetype/src/otvalid/otvmod.h b/drivers/freetype/src/otvalid/otvmod.h similarity index 100% rename from drivers/freetype/freetype/src/otvalid/otvmod.h rename to drivers/freetype/src/otvalid/otvmod.h diff --git a/drivers/freetype/freetype/src/otvalid/rules.mk b/drivers/freetype/src/otvalid/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/otvalid/rules.mk rename to drivers/freetype/src/otvalid/rules.mk diff --git a/drivers/freetype/freetype/src/pcf/Jamfile b/drivers/freetype/src/pcf/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/pcf/Jamfile rename to drivers/freetype/src/pcf/Jamfile diff --git a/drivers/freetype/freetype/src/pcf/README b/drivers/freetype/src/pcf/README similarity index 100% rename from drivers/freetype/freetype/src/pcf/README rename to drivers/freetype/src/pcf/README diff --git a/drivers/freetype/freetype/src/pcf/module.mk b/drivers/freetype/src/pcf/module.mk similarity index 100% rename from drivers/freetype/freetype/src/pcf/module.mk rename to drivers/freetype/src/pcf/module.mk diff --git a/drivers/freetype/freetype/src/pcf/pcf.c b/drivers/freetype/src/pcf/pcf.c similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcf.c rename to drivers/freetype/src/pcf/pcf.c diff --git a/drivers/freetype/freetype/src/pcf/pcf.h b/drivers/freetype/src/pcf/pcf.h similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcf.h rename to drivers/freetype/src/pcf/pcf.h diff --git a/drivers/freetype/freetype/src/pcf/pcfdrivr.c b/drivers/freetype/src/pcf/pcfdrivr.c similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcfdrivr.c rename to drivers/freetype/src/pcf/pcfdrivr.c diff --git a/drivers/freetype/freetype/src/pcf/pcfdrivr.h b/drivers/freetype/src/pcf/pcfdrivr.h similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcfdrivr.h rename to drivers/freetype/src/pcf/pcfdrivr.h diff --git a/drivers/freetype/freetype/src/pcf/pcferror.h b/drivers/freetype/src/pcf/pcferror.h similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcferror.h rename to drivers/freetype/src/pcf/pcferror.h diff --git a/drivers/freetype/freetype/src/pcf/pcfread.c b/drivers/freetype/src/pcf/pcfread.c similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcfread.c rename to drivers/freetype/src/pcf/pcfread.c diff --git a/drivers/freetype/freetype/src/pcf/pcfread.h b/drivers/freetype/src/pcf/pcfread.h similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcfread.h rename to drivers/freetype/src/pcf/pcfread.h diff --git a/drivers/freetype/freetype/src/pcf/pcfutil.c b/drivers/freetype/src/pcf/pcfutil.c similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcfutil.c rename to drivers/freetype/src/pcf/pcfutil.c diff --git a/drivers/freetype/freetype/src/pcf/pcfutil.h b/drivers/freetype/src/pcf/pcfutil.h similarity index 100% rename from drivers/freetype/freetype/src/pcf/pcfutil.h rename to drivers/freetype/src/pcf/pcfutil.h diff --git a/drivers/freetype/freetype/src/pcf/rules.mk b/drivers/freetype/src/pcf/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/pcf/rules.mk rename to drivers/freetype/src/pcf/rules.mk diff --git a/drivers/freetype/freetype/src/pfr/Jamfile b/drivers/freetype/src/pfr/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/pfr/Jamfile rename to drivers/freetype/src/pfr/Jamfile diff --git a/drivers/freetype/freetype/src/pfr/module.mk b/drivers/freetype/src/pfr/module.mk similarity index 100% rename from drivers/freetype/freetype/src/pfr/module.mk rename to drivers/freetype/src/pfr/module.mk diff --git a/drivers/freetype/freetype/src/pfr/pfr.c b/drivers/freetype/src/pfr/pfr.c similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfr.c rename to drivers/freetype/src/pfr/pfr.c diff --git a/drivers/freetype/freetype/src/pfr/pfrcmap.c b/drivers/freetype/src/pfr/pfrcmap.c similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrcmap.c rename to drivers/freetype/src/pfr/pfrcmap.c diff --git a/drivers/freetype/freetype/src/pfr/pfrcmap.h b/drivers/freetype/src/pfr/pfrcmap.h similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrcmap.h rename to drivers/freetype/src/pfr/pfrcmap.h diff --git a/drivers/freetype/freetype/src/pfr/pfrdrivr.c b/drivers/freetype/src/pfr/pfrdrivr.c similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrdrivr.c rename to drivers/freetype/src/pfr/pfrdrivr.c diff --git a/drivers/freetype/freetype/src/pfr/pfrdrivr.h b/drivers/freetype/src/pfr/pfrdrivr.h similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrdrivr.h rename to drivers/freetype/src/pfr/pfrdrivr.h diff --git a/drivers/freetype/freetype/src/pfr/pfrerror.h b/drivers/freetype/src/pfr/pfrerror.h similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrerror.h rename to drivers/freetype/src/pfr/pfrerror.h diff --git a/drivers/freetype/freetype/src/pfr/pfrgload.c b/drivers/freetype/src/pfr/pfrgload.c similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrgload.c rename to drivers/freetype/src/pfr/pfrgload.c diff --git a/drivers/freetype/freetype/src/pfr/pfrgload.h b/drivers/freetype/src/pfr/pfrgload.h similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrgload.h rename to drivers/freetype/src/pfr/pfrgload.h diff --git a/drivers/freetype/freetype/src/pfr/pfrload.c b/drivers/freetype/src/pfr/pfrload.c similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrload.c rename to drivers/freetype/src/pfr/pfrload.c diff --git a/drivers/freetype/freetype/src/pfr/pfrload.h b/drivers/freetype/src/pfr/pfrload.h similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrload.h rename to drivers/freetype/src/pfr/pfrload.h diff --git a/drivers/freetype/freetype/src/pfr/pfrobjs.c b/drivers/freetype/src/pfr/pfrobjs.c similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrobjs.c rename to drivers/freetype/src/pfr/pfrobjs.c diff --git a/drivers/freetype/freetype/src/pfr/pfrobjs.h b/drivers/freetype/src/pfr/pfrobjs.h similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrobjs.h rename to drivers/freetype/src/pfr/pfrobjs.h diff --git a/drivers/freetype/freetype/src/pfr/pfrsbit.c b/drivers/freetype/src/pfr/pfrsbit.c similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrsbit.c rename to drivers/freetype/src/pfr/pfrsbit.c diff --git a/drivers/freetype/freetype/src/pfr/pfrsbit.h b/drivers/freetype/src/pfr/pfrsbit.h similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrsbit.h rename to drivers/freetype/src/pfr/pfrsbit.h diff --git a/drivers/freetype/freetype/src/pfr/pfrtypes.h b/drivers/freetype/src/pfr/pfrtypes.h similarity index 100% rename from drivers/freetype/freetype/src/pfr/pfrtypes.h rename to drivers/freetype/src/pfr/pfrtypes.h diff --git a/drivers/freetype/freetype/src/pfr/rules.mk b/drivers/freetype/src/pfr/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/pfr/rules.mk rename to drivers/freetype/src/pfr/rules.mk diff --git a/drivers/freetype/freetype/src/psaux/Jamfile b/drivers/freetype/src/psaux/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/psaux/Jamfile rename to drivers/freetype/src/psaux/Jamfile diff --git a/drivers/freetype/freetype/src/psaux/afmparse.c b/drivers/freetype/src/psaux/afmparse.c similarity index 100% rename from drivers/freetype/freetype/src/psaux/afmparse.c rename to drivers/freetype/src/psaux/afmparse.c diff --git a/drivers/freetype/freetype/src/psaux/afmparse.h b/drivers/freetype/src/psaux/afmparse.h similarity index 100% rename from drivers/freetype/freetype/src/psaux/afmparse.h rename to drivers/freetype/src/psaux/afmparse.h diff --git a/drivers/freetype/freetype/src/psaux/module.mk b/drivers/freetype/src/psaux/module.mk similarity index 100% rename from drivers/freetype/freetype/src/psaux/module.mk rename to drivers/freetype/src/psaux/module.mk diff --git a/drivers/freetype/freetype/src/psaux/psaux.c b/drivers/freetype/src/psaux/psaux.c similarity index 100% rename from drivers/freetype/freetype/src/psaux/psaux.c rename to drivers/freetype/src/psaux/psaux.c diff --git a/drivers/freetype/freetype/src/psaux/psauxerr.h b/drivers/freetype/src/psaux/psauxerr.h similarity index 100% rename from drivers/freetype/freetype/src/psaux/psauxerr.h rename to drivers/freetype/src/psaux/psauxerr.h diff --git a/drivers/freetype/freetype/src/psaux/psauxmod.c b/drivers/freetype/src/psaux/psauxmod.c similarity index 100% rename from drivers/freetype/freetype/src/psaux/psauxmod.c rename to drivers/freetype/src/psaux/psauxmod.c diff --git a/drivers/freetype/freetype/src/psaux/psauxmod.h b/drivers/freetype/src/psaux/psauxmod.h similarity index 100% rename from drivers/freetype/freetype/src/psaux/psauxmod.h rename to drivers/freetype/src/psaux/psauxmod.h diff --git a/drivers/freetype/freetype/src/psaux/psconv.c b/drivers/freetype/src/psaux/psconv.c similarity index 100% rename from drivers/freetype/freetype/src/psaux/psconv.c rename to drivers/freetype/src/psaux/psconv.c diff --git a/drivers/freetype/freetype/src/psaux/psconv.h b/drivers/freetype/src/psaux/psconv.h similarity index 100% rename from drivers/freetype/freetype/src/psaux/psconv.h rename to drivers/freetype/src/psaux/psconv.h diff --git a/drivers/freetype/freetype/src/psaux/psobjs.c b/drivers/freetype/src/psaux/psobjs.c similarity index 100% rename from drivers/freetype/freetype/src/psaux/psobjs.c rename to drivers/freetype/src/psaux/psobjs.c diff --git a/drivers/freetype/freetype/src/psaux/psobjs.h b/drivers/freetype/src/psaux/psobjs.h similarity index 100% rename from drivers/freetype/freetype/src/psaux/psobjs.h rename to drivers/freetype/src/psaux/psobjs.h diff --git a/drivers/freetype/freetype/src/psaux/rules.mk b/drivers/freetype/src/psaux/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/psaux/rules.mk rename to drivers/freetype/src/psaux/rules.mk diff --git a/drivers/freetype/freetype/src/psaux/t1cmap.c b/drivers/freetype/src/psaux/t1cmap.c similarity index 100% rename from drivers/freetype/freetype/src/psaux/t1cmap.c rename to drivers/freetype/src/psaux/t1cmap.c diff --git a/drivers/freetype/freetype/src/psaux/t1cmap.h b/drivers/freetype/src/psaux/t1cmap.h similarity index 100% rename from drivers/freetype/freetype/src/psaux/t1cmap.h rename to drivers/freetype/src/psaux/t1cmap.h diff --git a/drivers/freetype/freetype/src/psaux/t1decode.c b/drivers/freetype/src/psaux/t1decode.c similarity index 100% rename from drivers/freetype/freetype/src/psaux/t1decode.c rename to drivers/freetype/src/psaux/t1decode.c diff --git a/drivers/freetype/freetype/src/psaux/t1decode.h b/drivers/freetype/src/psaux/t1decode.h similarity index 100% rename from drivers/freetype/freetype/src/psaux/t1decode.h rename to drivers/freetype/src/psaux/t1decode.h diff --git a/drivers/freetype/freetype/src/pshinter/Jamfile b/drivers/freetype/src/pshinter/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/pshinter/Jamfile rename to drivers/freetype/src/pshinter/Jamfile diff --git a/drivers/freetype/freetype/src/pshinter/module.mk b/drivers/freetype/src/pshinter/module.mk similarity index 100% rename from drivers/freetype/freetype/src/pshinter/module.mk rename to drivers/freetype/src/pshinter/module.mk diff --git a/drivers/freetype/freetype/src/pshinter/pshalgo.c b/drivers/freetype/src/pshinter/pshalgo.c similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshalgo.c rename to drivers/freetype/src/pshinter/pshalgo.c diff --git a/drivers/freetype/freetype/src/pshinter/pshalgo.h b/drivers/freetype/src/pshinter/pshalgo.h similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshalgo.h rename to drivers/freetype/src/pshinter/pshalgo.h diff --git a/drivers/freetype/freetype/src/pshinter/pshglob.c b/drivers/freetype/src/pshinter/pshglob.c similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshglob.c rename to drivers/freetype/src/pshinter/pshglob.c diff --git a/drivers/freetype/freetype/src/pshinter/pshglob.h b/drivers/freetype/src/pshinter/pshglob.h similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshglob.h rename to drivers/freetype/src/pshinter/pshglob.h diff --git a/drivers/freetype/freetype/src/pshinter/pshinter.c b/drivers/freetype/src/pshinter/pshinter.c similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshinter.c rename to drivers/freetype/src/pshinter/pshinter.c diff --git a/drivers/freetype/freetype/src/pshinter/pshmod.c b/drivers/freetype/src/pshinter/pshmod.c similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshmod.c rename to drivers/freetype/src/pshinter/pshmod.c diff --git a/drivers/freetype/freetype/src/pshinter/pshmod.h b/drivers/freetype/src/pshinter/pshmod.h similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshmod.h rename to drivers/freetype/src/pshinter/pshmod.h diff --git a/drivers/freetype/freetype/src/pshinter/pshnterr.h b/drivers/freetype/src/pshinter/pshnterr.h similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshnterr.h rename to drivers/freetype/src/pshinter/pshnterr.h diff --git a/drivers/freetype/freetype/src/pshinter/pshpic.c b/drivers/freetype/src/pshinter/pshpic.c similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshpic.c rename to drivers/freetype/src/pshinter/pshpic.c diff --git a/drivers/freetype/freetype/src/pshinter/pshpic.h b/drivers/freetype/src/pshinter/pshpic.h similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshpic.h rename to drivers/freetype/src/pshinter/pshpic.h diff --git a/drivers/freetype/freetype/src/pshinter/pshrec.c b/drivers/freetype/src/pshinter/pshrec.c similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshrec.c rename to drivers/freetype/src/pshinter/pshrec.c diff --git a/drivers/freetype/freetype/src/pshinter/pshrec.h b/drivers/freetype/src/pshinter/pshrec.h similarity index 100% rename from drivers/freetype/freetype/src/pshinter/pshrec.h rename to drivers/freetype/src/pshinter/pshrec.h diff --git a/drivers/freetype/freetype/src/pshinter/rules.mk b/drivers/freetype/src/pshinter/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/pshinter/rules.mk rename to drivers/freetype/src/pshinter/rules.mk diff --git a/drivers/freetype/freetype/src/psnames/Jamfile b/drivers/freetype/src/psnames/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/psnames/Jamfile rename to drivers/freetype/src/psnames/Jamfile diff --git a/drivers/freetype/freetype/src/psnames/module.mk b/drivers/freetype/src/psnames/module.mk similarity index 100% rename from drivers/freetype/freetype/src/psnames/module.mk rename to drivers/freetype/src/psnames/module.mk diff --git a/drivers/freetype/freetype/src/psnames/psmodule.c b/drivers/freetype/src/psnames/psmodule.c similarity index 100% rename from drivers/freetype/freetype/src/psnames/psmodule.c rename to drivers/freetype/src/psnames/psmodule.c diff --git a/drivers/freetype/freetype/src/psnames/psmodule.h b/drivers/freetype/src/psnames/psmodule.h similarity index 100% rename from drivers/freetype/freetype/src/psnames/psmodule.h rename to drivers/freetype/src/psnames/psmodule.h diff --git a/drivers/freetype/freetype/src/psnames/psnamerr.h b/drivers/freetype/src/psnames/psnamerr.h similarity index 100% rename from drivers/freetype/freetype/src/psnames/psnamerr.h rename to drivers/freetype/src/psnames/psnamerr.h diff --git a/drivers/freetype/freetype/src/psnames/psnames.c b/drivers/freetype/src/psnames/psnames.c similarity index 100% rename from drivers/freetype/freetype/src/psnames/psnames.c rename to drivers/freetype/src/psnames/psnames.c diff --git a/drivers/freetype/freetype/src/psnames/pspic.c b/drivers/freetype/src/psnames/pspic.c similarity index 100% rename from drivers/freetype/freetype/src/psnames/pspic.c rename to drivers/freetype/src/psnames/pspic.c diff --git a/drivers/freetype/freetype/src/psnames/pspic.h b/drivers/freetype/src/psnames/pspic.h similarity index 100% rename from drivers/freetype/freetype/src/psnames/pspic.h rename to drivers/freetype/src/psnames/pspic.h diff --git a/drivers/freetype/freetype/src/psnames/pstables.h b/drivers/freetype/src/psnames/pstables.h similarity index 100% rename from drivers/freetype/freetype/src/psnames/pstables.h rename to drivers/freetype/src/psnames/pstables.h diff --git a/drivers/freetype/freetype/src/psnames/rules.mk b/drivers/freetype/src/psnames/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/psnames/rules.mk rename to drivers/freetype/src/psnames/rules.mk diff --git a/drivers/freetype/freetype/src/raster/Jamfile b/drivers/freetype/src/raster/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/raster/Jamfile rename to drivers/freetype/src/raster/Jamfile diff --git a/drivers/freetype/freetype/src/raster/ftmisc.h b/drivers/freetype/src/raster/ftmisc.h similarity index 100% rename from drivers/freetype/freetype/src/raster/ftmisc.h rename to drivers/freetype/src/raster/ftmisc.h diff --git a/drivers/freetype/freetype/src/raster/ftraster.c b/drivers/freetype/src/raster/ftraster.c similarity index 100% rename from drivers/freetype/freetype/src/raster/ftraster.c rename to drivers/freetype/src/raster/ftraster.c diff --git a/drivers/freetype/freetype/src/raster/ftraster.h b/drivers/freetype/src/raster/ftraster.h similarity index 100% rename from drivers/freetype/freetype/src/raster/ftraster.h rename to drivers/freetype/src/raster/ftraster.h diff --git a/drivers/freetype/freetype/src/raster/ftrend1.c b/drivers/freetype/src/raster/ftrend1.c similarity index 100% rename from drivers/freetype/freetype/src/raster/ftrend1.c rename to drivers/freetype/src/raster/ftrend1.c diff --git a/drivers/freetype/freetype/src/raster/ftrend1.h b/drivers/freetype/src/raster/ftrend1.h similarity index 100% rename from drivers/freetype/freetype/src/raster/ftrend1.h rename to drivers/freetype/src/raster/ftrend1.h diff --git a/drivers/freetype/freetype/src/raster/module.mk b/drivers/freetype/src/raster/module.mk similarity index 100% rename from drivers/freetype/freetype/src/raster/module.mk rename to drivers/freetype/src/raster/module.mk diff --git a/drivers/freetype/freetype/src/raster/raster.c b/drivers/freetype/src/raster/raster.c similarity index 100% rename from drivers/freetype/freetype/src/raster/raster.c rename to drivers/freetype/src/raster/raster.c diff --git a/drivers/freetype/freetype/src/raster/rasterrs.h b/drivers/freetype/src/raster/rasterrs.h similarity index 100% rename from drivers/freetype/freetype/src/raster/rasterrs.h rename to drivers/freetype/src/raster/rasterrs.h diff --git a/drivers/freetype/freetype/src/raster/rastpic.c b/drivers/freetype/src/raster/rastpic.c similarity index 100% rename from drivers/freetype/freetype/src/raster/rastpic.c rename to drivers/freetype/src/raster/rastpic.c diff --git a/drivers/freetype/freetype/src/raster/rastpic.h b/drivers/freetype/src/raster/rastpic.h similarity index 100% rename from drivers/freetype/freetype/src/raster/rastpic.h rename to drivers/freetype/src/raster/rastpic.h diff --git a/drivers/freetype/freetype/src/raster/rules.mk b/drivers/freetype/src/raster/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/raster/rules.mk rename to drivers/freetype/src/raster/rules.mk diff --git a/drivers/freetype/freetype/src/sfnt/Jamfile b/drivers/freetype/src/sfnt/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/sfnt/Jamfile rename to drivers/freetype/src/sfnt/Jamfile diff --git a/drivers/freetype/freetype/src/sfnt/module.mk b/drivers/freetype/src/sfnt/module.mk similarity index 100% rename from drivers/freetype/freetype/src/sfnt/module.mk rename to drivers/freetype/src/sfnt/module.mk diff --git a/drivers/freetype/freetype/src/sfnt/pngshim.c b/drivers/freetype/src/sfnt/pngshim.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/pngshim.c rename to drivers/freetype/src/sfnt/pngshim.c diff --git a/drivers/freetype/freetype/src/sfnt/pngshim.h b/drivers/freetype/src/sfnt/pngshim.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/pngshim.h rename to drivers/freetype/src/sfnt/pngshim.h diff --git a/drivers/freetype/freetype/src/sfnt/rules.mk b/drivers/freetype/src/sfnt/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/sfnt/rules.mk rename to drivers/freetype/src/sfnt/rules.mk diff --git a/drivers/freetype/freetype/src/sfnt/sfdriver.c b/drivers/freetype/src/sfnt/sfdriver.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/sfdriver.c rename to drivers/freetype/src/sfnt/sfdriver.c diff --git a/drivers/freetype/freetype/src/sfnt/sfdriver.h b/drivers/freetype/src/sfnt/sfdriver.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/sfdriver.h rename to drivers/freetype/src/sfnt/sfdriver.h diff --git a/drivers/freetype/freetype/src/sfnt/sferrors.h b/drivers/freetype/src/sfnt/sferrors.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/sferrors.h rename to drivers/freetype/src/sfnt/sferrors.h diff --git a/drivers/freetype/freetype/src/sfnt/sfnt.c b/drivers/freetype/src/sfnt/sfnt.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/sfnt.c rename to drivers/freetype/src/sfnt/sfnt.c diff --git a/drivers/freetype/freetype/src/sfnt/sfntpic.c b/drivers/freetype/src/sfnt/sfntpic.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/sfntpic.c rename to drivers/freetype/src/sfnt/sfntpic.c diff --git a/drivers/freetype/freetype/src/sfnt/sfntpic.h b/drivers/freetype/src/sfnt/sfntpic.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/sfntpic.h rename to drivers/freetype/src/sfnt/sfntpic.h diff --git a/drivers/freetype/freetype/src/sfnt/sfobjs.c b/drivers/freetype/src/sfnt/sfobjs.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/sfobjs.c rename to drivers/freetype/src/sfnt/sfobjs.c diff --git a/drivers/freetype/freetype/src/sfnt/sfobjs.h b/drivers/freetype/src/sfnt/sfobjs.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/sfobjs.h rename to drivers/freetype/src/sfnt/sfobjs.h diff --git a/drivers/freetype/freetype/src/sfnt/ttbdf.c b/drivers/freetype/src/sfnt/ttbdf.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttbdf.c rename to drivers/freetype/src/sfnt/ttbdf.c diff --git a/drivers/freetype/freetype/src/sfnt/ttbdf.h b/drivers/freetype/src/sfnt/ttbdf.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttbdf.h rename to drivers/freetype/src/sfnt/ttbdf.h diff --git a/drivers/freetype/freetype/src/sfnt/ttcmap.c b/drivers/freetype/src/sfnt/ttcmap.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttcmap.c rename to drivers/freetype/src/sfnt/ttcmap.c diff --git a/drivers/freetype/freetype/src/sfnt/ttcmap.h b/drivers/freetype/src/sfnt/ttcmap.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttcmap.h rename to drivers/freetype/src/sfnt/ttcmap.h diff --git a/drivers/freetype/freetype/src/sfnt/ttcmapc.h b/drivers/freetype/src/sfnt/ttcmapc.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttcmapc.h rename to drivers/freetype/src/sfnt/ttcmapc.h diff --git a/drivers/freetype/freetype/src/sfnt/ttkern.c b/drivers/freetype/src/sfnt/ttkern.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttkern.c rename to drivers/freetype/src/sfnt/ttkern.c diff --git a/drivers/freetype/freetype/src/sfnt/ttkern.h b/drivers/freetype/src/sfnt/ttkern.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttkern.h rename to drivers/freetype/src/sfnt/ttkern.h diff --git a/drivers/freetype/freetype/src/sfnt/ttload.c b/drivers/freetype/src/sfnt/ttload.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttload.c rename to drivers/freetype/src/sfnt/ttload.c diff --git a/drivers/freetype/freetype/src/sfnt/ttload.h b/drivers/freetype/src/sfnt/ttload.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttload.h rename to drivers/freetype/src/sfnt/ttload.h diff --git a/drivers/freetype/freetype/src/sfnt/ttmtx.c b/drivers/freetype/src/sfnt/ttmtx.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttmtx.c rename to drivers/freetype/src/sfnt/ttmtx.c diff --git a/drivers/freetype/freetype/src/sfnt/ttmtx.h b/drivers/freetype/src/sfnt/ttmtx.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttmtx.h rename to drivers/freetype/src/sfnt/ttmtx.h diff --git a/drivers/freetype/freetype/src/sfnt/ttpost.c b/drivers/freetype/src/sfnt/ttpost.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttpost.c rename to drivers/freetype/src/sfnt/ttpost.c diff --git a/drivers/freetype/freetype/src/sfnt/ttpost.h b/drivers/freetype/src/sfnt/ttpost.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttpost.h rename to drivers/freetype/src/sfnt/ttpost.h diff --git a/drivers/freetype/freetype/src/sfnt/ttsbit.c b/drivers/freetype/src/sfnt/ttsbit.c similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttsbit.c rename to drivers/freetype/src/sfnt/ttsbit.c diff --git a/drivers/freetype/freetype/src/sfnt/ttsbit.h b/drivers/freetype/src/sfnt/ttsbit.h similarity index 100% rename from drivers/freetype/freetype/src/sfnt/ttsbit.h rename to drivers/freetype/src/sfnt/ttsbit.h diff --git a/drivers/freetype/freetype/src/smooth/Jamfile b/drivers/freetype/src/smooth/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/smooth/Jamfile rename to drivers/freetype/src/smooth/Jamfile diff --git a/drivers/freetype/freetype/src/smooth/ftgrays.c b/drivers/freetype/src/smooth/ftgrays.c similarity index 100% rename from drivers/freetype/freetype/src/smooth/ftgrays.c rename to drivers/freetype/src/smooth/ftgrays.c diff --git a/drivers/freetype/freetype/src/smooth/ftgrays.h b/drivers/freetype/src/smooth/ftgrays.h similarity index 100% rename from drivers/freetype/freetype/src/smooth/ftgrays.h rename to drivers/freetype/src/smooth/ftgrays.h diff --git a/drivers/freetype/freetype/src/smooth/ftsmerrs.h b/drivers/freetype/src/smooth/ftsmerrs.h similarity index 100% rename from drivers/freetype/freetype/src/smooth/ftsmerrs.h rename to drivers/freetype/src/smooth/ftsmerrs.h diff --git a/drivers/freetype/freetype/src/smooth/ftsmooth.c b/drivers/freetype/src/smooth/ftsmooth.c similarity index 100% rename from drivers/freetype/freetype/src/smooth/ftsmooth.c rename to drivers/freetype/src/smooth/ftsmooth.c diff --git a/drivers/freetype/freetype/src/smooth/ftsmooth.h b/drivers/freetype/src/smooth/ftsmooth.h similarity index 100% rename from drivers/freetype/freetype/src/smooth/ftsmooth.h rename to drivers/freetype/src/smooth/ftsmooth.h diff --git a/drivers/freetype/freetype/src/smooth/ftspic.c b/drivers/freetype/src/smooth/ftspic.c similarity index 100% rename from drivers/freetype/freetype/src/smooth/ftspic.c rename to drivers/freetype/src/smooth/ftspic.c diff --git a/drivers/freetype/freetype/src/smooth/ftspic.h b/drivers/freetype/src/smooth/ftspic.h similarity index 100% rename from drivers/freetype/freetype/src/smooth/ftspic.h rename to drivers/freetype/src/smooth/ftspic.h diff --git a/drivers/freetype/freetype/src/smooth/module.mk b/drivers/freetype/src/smooth/module.mk similarity index 100% rename from drivers/freetype/freetype/src/smooth/module.mk rename to drivers/freetype/src/smooth/module.mk diff --git a/drivers/freetype/freetype/src/smooth/rules.mk b/drivers/freetype/src/smooth/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/smooth/rules.mk rename to drivers/freetype/src/smooth/rules.mk diff --git a/drivers/freetype/freetype/src/smooth/smooth.c b/drivers/freetype/src/smooth/smooth.c similarity index 100% rename from drivers/freetype/freetype/src/smooth/smooth.c rename to drivers/freetype/src/smooth/smooth.c diff --git a/drivers/freetype/freetype/src/truetype/Jamfile b/drivers/freetype/src/truetype/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/truetype/Jamfile rename to drivers/freetype/src/truetype/Jamfile diff --git a/drivers/freetype/freetype/src/truetype/module.mk b/drivers/freetype/src/truetype/module.mk similarity index 100% rename from drivers/freetype/freetype/src/truetype/module.mk rename to drivers/freetype/src/truetype/module.mk diff --git a/drivers/freetype/freetype/src/truetype/rules.mk b/drivers/freetype/src/truetype/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/truetype/rules.mk rename to drivers/freetype/src/truetype/rules.mk diff --git a/drivers/freetype/freetype/src/truetype/truetype.c b/drivers/freetype/src/truetype/truetype.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/truetype.c rename to drivers/freetype/src/truetype/truetype.c diff --git a/drivers/freetype/freetype/src/truetype/ttdriver.c b/drivers/freetype/src/truetype/ttdriver.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttdriver.c rename to drivers/freetype/src/truetype/ttdriver.c diff --git a/drivers/freetype/freetype/src/truetype/ttdriver.h b/drivers/freetype/src/truetype/ttdriver.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttdriver.h rename to drivers/freetype/src/truetype/ttdriver.h diff --git a/drivers/freetype/freetype/src/truetype/tterrors.h b/drivers/freetype/src/truetype/tterrors.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/tterrors.h rename to drivers/freetype/src/truetype/tterrors.h diff --git a/drivers/freetype/freetype/src/truetype/ttgload.c b/drivers/freetype/src/truetype/ttgload.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttgload.c rename to drivers/freetype/src/truetype/ttgload.c diff --git a/drivers/freetype/freetype/src/truetype/ttgload.h b/drivers/freetype/src/truetype/ttgload.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttgload.h rename to drivers/freetype/src/truetype/ttgload.h diff --git a/drivers/freetype/freetype/src/truetype/ttgxvar.c b/drivers/freetype/src/truetype/ttgxvar.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttgxvar.c rename to drivers/freetype/src/truetype/ttgxvar.c diff --git a/drivers/freetype/freetype/src/truetype/ttgxvar.h b/drivers/freetype/src/truetype/ttgxvar.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttgxvar.h rename to drivers/freetype/src/truetype/ttgxvar.h diff --git a/drivers/freetype/freetype/src/truetype/ttinterp.c b/drivers/freetype/src/truetype/ttinterp.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttinterp.c rename to drivers/freetype/src/truetype/ttinterp.c diff --git a/drivers/freetype/freetype/src/truetype/ttinterp.h b/drivers/freetype/src/truetype/ttinterp.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttinterp.h rename to drivers/freetype/src/truetype/ttinterp.h diff --git a/drivers/freetype/freetype/src/truetype/ttobjs.c b/drivers/freetype/src/truetype/ttobjs.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttobjs.c rename to drivers/freetype/src/truetype/ttobjs.c diff --git a/drivers/freetype/freetype/src/truetype/ttobjs.h b/drivers/freetype/src/truetype/ttobjs.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttobjs.h rename to drivers/freetype/src/truetype/ttobjs.h diff --git a/drivers/freetype/freetype/src/truetype/ttpic.c b/drivers/freetype/src/truetype/ttpic.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttpic.c rename to drivers/freetype/src/truetype/ttpic.c diff --git a/drivers/freetype/freetype/src/truetype/ttpic.h b/drivers/freetype/src/truetype/ttpic.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttpic.h rename to drivers/freetype/src/truetype/ttpic.h diff --git a/drivers/freetype/freetype/src/truetype/ttpload.c b/drivers/freetype/src/truetype/ttpload.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttpload.c rename to drivers/freetype/src/truetype/ttpload.c diff --git a/drivers/freetype/freetype/src/truetype/ttpload.h b/drivers/freetype/src/truetype/ttpload.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttpload.h rename to drivers/freetype/src/truetype/ttpload.h diff --git a/drivers/freetype/freetype/src/truetype/ttsubpix.c b/drivers/freetype/src/truetype/ttsubpix.c similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttsubpix.c rename to drivers/freetype/src/truetype/ttsubpix.c diff --git a/drivers/freetype/freetype/src/truetype/ttsubpix.h b/drivers/freetype/src/truetype/ttsubpix.h similarity index 100% rename from drivers/freetype/freetype/src/truetype/ttsubpix.h rename to drivers/freetype/src/truetype/ttsubpix.h diff --git a/drivers/freetype/freetype/src/type1/Jamfile b/drivers/freetype/src/type1/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/type1/Jamfile rename to drivers/freetype/src/type1/Jamfile diff --git a/drivers/freetype/freetype/src/type1/module.mk b/drivers/freetype/src/type1/module.mk similarity index 100% rename from drivers/freetype/freetype/src/type1/module.mk rename to drivers/freetype/src/type1/module.mk diff --git a/drivers/freetype/freetype/src/type1/rules.mk b/drivers/freetype/src/type1/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/type1/rules.mk rename to drivers/freetype/src/type1/rules.mk diff --git a/drivers/freetype/freetype/src/type1/t1afm.c b/drivers/freetype/src/type1/t1afm.c similarity index 100% rename from drivers/freetype/freetype/src/type1/t1afm.c rename to drivers/freetype/src/type1/t1afm.c diff --git a/drivers/freetype/freetype/src/type1/t1afm.h b/drivers/freetype/src/type1/t1afm.h similarity index 100% rename from drivers/freetype/freetype/src/type1/t1afm.h rename to drivers/freetype/src/type1/t1afm.h diff --git a/drivers/freetype/freetype/src/type1/t1driver.c b/drivers/freetype/src/type1/t1driver.c similarity index 100% rename from drivers/freetype/freetype/src/type1/t1driver.c rename to drivers/freetype/src/type1/t1driver.c diff --git a/drivers/freetype/freetype/src/type1/t1driver.h b/drivers/freetype/src/type1/t1driver.h similarity index 100% rename from drivers/freetype/freetype/src/type1/t1driver.h rename to drivers/freetype/src/type1/t1driver.h diff --git a/drivers/freetype/freetype/src/type1/t1errors.h b/drivers/freetype/src/type1/t1errors.h similarity index 100% rename from drivers/freetype/freetype/src/type1/t1errors.h rename to drivers/freetype/src/type1/t1errors.h diff --git a/drivers/freetype/freetype/src/type1/t1gload.c b/drivers/freetype/src/type1/t1gload.c similarity index 100% rename from drivers/freetype/freetype/src/type1/t1gload.c rename to drivers/freetype/src/type1/t1gload.c diff --git a/drivers/freetype/freetype/src/type1/t1gload.h b/drivers/freetype/src/type1/t1gload.h similarity index 100% rename from drivers/freetype/freetype/src/type1/t1gload.h rename to drivers/freetype/src/type1/t1gload.h diff --git a/drivers/freetype/freetype/src/type1/t1load.c b/drivers/freetype/src/type1/t1load.c similarity index 100% rename from drivers/freetype/freetype/src/type1/t1load.c rename to drivers/freetype/src/type1/t1load.c diff --git a/drivers/freetype/freetype/src/type1/t1load.h b/drivers/freetype/src/type1/t1load.h similarity index 100% rename from drivers/freetype/freetype/src/type1/t1load.h rename to drivers/freetype/src/type1/t1load.h diff --git a/drivers/freetype/freetype/src/type1/t1objs.c b/drivers/freetype/src/type1/t1objs.c similarity index 100% rename from drivers/freetype/freetype/src/type1/t1objs.c rename to drivers/freetype/src/type1/t1objs.c diff --git a/drivers/freetype/freetype/src/type1/t1objs.h b/drivers/freetype/src/type1/t1objs.h similarity index 100% rename from drivers/freetype/freetype/src/type1/t1objs.h rename to drivers/freetype/src/type1/t1objs.h diff --git a/drivers/freetype/freetype/src/type1/t1parse.c b/drivers/freetype/src/type1/t1parse.c similarity index 100% rename from drivers/freetype/freetype/src/type1/t1parse.c rename to drivers/freetype/src/type1/t1parse.c diff --git a/drivers/freetype/freetype/src/type1/t1parse.h b/drivers/freetype/src/type1/t1parse.h similarity index 100% rename from drivers/freetype/freetype/src/type1/t1parse.h rename to drivers/freetype/src/type1/t1parse.h diff --git a/drivers/freetype/freetype/src/type1/t1tokens.h b/drivers/freetype/src/type1/t1tokens.h similarity index 100% rename from drivers/freetype/freetype/src/type1/t1tokens.h rename to drivers/freetype/src/type1/t1tokens.h diff --git a/drivers/freetype/freetype/src/type1/type1.c b/drivers/freetype/src/type1/type1.c similarity index 100% rename from drivers/freetype/freetype/src/type1/type1.c rename to drivers/freetype/src/type1/type1.c diff --git a/drivers/freetype/freetype/src/type42/Jamfile b/drivers/freetype/src/type42/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/type42/Jamfile rename to drivers/freetype/src/type42/Jamfile diff --git a/drivers/freetype/freetype/src/type42/module.mk b/drivers/freetype/src/type42/module.mk similarity index 100% rename from drivers/freetype/freetype/src/type42/module.mk rename to drivers/freetype/src/type42/module.mk diff --git a/drivers/freetype/freetype/src/type42/rules.mk b/drivers/freetype/src/type42/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/type42/rules.mk rename to drivers/freetype/src/type42/rules.mk diff --git a/drivers/freetype/freetype/src/type42/t42drivr.c b/drivers/freetype/src/type42/t42drivr.c similarity index 100% rename from drivers/freetype/freetype/src/type42/t42drivr.c rename to drivers/freetype/src/type42/t42drivr.c diff --git a/drivers/freetype/freetype/src/type42/t42drivr.h b/drivers/freetype/src/type42/t42drivr.h similarity index 100% rename from drivers/freetype/freetype/src/type42/t42drivr.h rename to drivers/freetype/src/type42/t42drivr.h diff --git a/drivers/freetype/freetype/src/type42/t42error.h b/drivers/freetype/src/type42/t42error.h similarity index 100% rename from drivers/freetype/freetype/src/type42/t42error.h rename to drivers/freetype/src/type42/t42error.h diff --git a/drivers/freetype/freetype/src/type42/t42objs.c b/drivers/freetype/src/type42/t42objs.c similarity index 100% rename from drivers/freetype/freetype/src/type42/t42objs.c rename to drivers/freetype/src/type42/t42objs.c diff --git a/drivers/freetype/freetype/src/type42/t42objs.h b/drivers/freetype/src/type42/t42objs.h similarity index 100% rename from drivers/freetype/freetype/src/type42/t42objs.h rename to drivers/freetype/src/type42/t42objs.h diff --git a/drivers/freetype/freetype/src/type42/t42parse.c b/drivers/freetype/src/type42/t42parse.c similarity index 100% rename from drivers/freetype/freetype/src/type42/t42parse.c rename to drivers/freetype/src/type42/t42parse.c diff --git a/drivers/freetype/freetype/src/type42/t42parse.h b/drivers/freetype/src/type42/t42parse.h similarity index 100% rename from drivers/freetype/freetype/src/type42/t42parse.h rename to drivers/freetype/src/type42/t42parse.h diff --git a/drivers/freetype/freetype/src/type42/t42types.h b/drivers/freetype/src/type42/t42types.h similarity index 100% rename from drivers/freetype/freetype/src/type42/t42types.h rename to drivers/freetype/src/type42/t42types.h diff --git a/drivers/freetype/freetype/src/type42/type42.c b/drivers/freetype/src/type42/type42.c similarity index 100% rename from drivers/freetype/freetype/src/type42/type42.c rename to drivers/freetype/src/type42/type42.c diff --git a/drivers/freetype/freetype/src/winfonts/Jamfile b/drivers/freetype/src/winfonts/Jamfile similarity index 100% rename from drivers/freetype/freetype/src/winfonts/Jamfile rename to drivers/freetype/src/winfonts/Jamfile diff --git a/drivers/freetype/freetype/src/winfonts/fnterrs.h b/drivers/freetype/src/winfonts/fnterrs.h similarity index 100% rename from drivers/freetype/freetype/src/winfonts/fnterrs.h rename to drivers/freetype/src/winfonts/fnterrs.h diff --git a/drivers/freetype/freetype/src/winfonts/module.mk b/drivers/freetype/src/winfonts/module.mk similarity index 100% rename from drivers/freetype/freetype/src/winfonts/module.mk rename to drivers/freetype/src/winfonts/module.mk diff --git a/drivers/freetype/freetype/src/winfonts/rules.mk b/drivers/freetype/src/winfonts/rules.mk similarity index 100% rename from drivers/freetype/freetype/src/winfonts/rules.mk rename to drivers/freetype/src/winfonts/rules.mk diff --git a/drivers/freetype/freetype/src/winfonts/winfnt.c b/drivers/freetype/src/winfonts/winfnt.c similarity index 100% rename from drivers/freetype/freetype/src/winfonts/winfnt.c rename to drivers/freetype/src/winfonts/winfnt.c diff --git a/drivers/freetype/freetype/src/winfonts/winfnt.h b/drivers/freetype/src/winfonts/winfnt.h similarity index 100% rename from drivers/freetype/freetype/src/winfonts/winfnt.h rename to drivers/freetype/src/winfonts/winfnt.h