diff --git a/components/external/freetype/docs/DEBUG b/components/external/freetype/docs/DEBUG deleted file mode 100644 index d8c79d187a56d003fdc19076c4aa20e5db551d5f..0000000000000000000000000000000000000000 --- a/components/external/freetype/docs/DEBUG +++ /dev/null @@ -1,204 +0,0 @@ -Debugging within the FreeType sources -===================================== - -I. Configuration macros ------------------------ - -There are several ways to enable debugging features in a FreeType 2 -builds. This is controlled through the definition of special macros -located in the file `ftoptions.h'. The macros are: - - - FT_DEBUG_LEVEL_ERROR - - #define this macro if you want to compile the FT_ERROR macro calls - to print error messages during program execution. This will not - stop the program. Very useful to spot invalid fonts during - development and to code workarounds for them. - - FT_DEBUG_LEVEL_TRACE - - #define this macro if you want to compile both macros FT_ERROR and - FT_TRACE. This also includes the variants FT_TRACE0, FT_TRACE1, - FT_TRACE2, ..., FT_TRACE7. - - The trace macros are used to send debugging messages when an - appropriate `debug level' is configured at runtime through the - FT2_DEBUG environment variable (more on this later). - - FT_DEBUG_MEMORY - - If this macro is #defined, the FreeType engine is linked with a - small but effective debugging memory manager that tracks all - allocations and frees that are performed within the font engine. - - When the FT2_DEBUG_MEMORY environment variable is defined at - runtime, a call to FT_Done_FreeType will dump memory statistics, - including the list of leaked memory blocks with the source - locations where these were allocated. It is always a very good - idea to define this in development builds. This works with _any_ - program linked to FreeType, but requires a big deal of memory (the - debugging memory manager never frees the blocks to the heap in - order to detect double frees). - - When FT2_DEBUG_MEMORY isn't defined at runtime, the debugging - memory manager is ignored, and performance is unaffected. - - -II. Debugging macros --------------------- - -Several macros can be used within the FreeType sources to help -debugging its code: - - - 1. FT_ERROR(( ... )) - - This macro is used to send debug messages that indicate relatively - serious errors (like broken font files), but will not stop the - execution of the running program. Its code is compiled only when - either FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined in - `ftoption.h'. - - Note that you have to use a printf-like signature, but with double - parentheses, like in - - FT_ERROR(( "your %s is not %s\n", "foo", "bar" )); - - - 2. FT_ASSERT( condition ) - - This macro is used to check strong assertions at runtime. If its - condition isn't TRUE, the program will abort with a panic message. - Its code is compiled when either FT_DEBUG_LEVEL_ERROR or - FT_DEBUG_LEVEL_TRACE are defined. You don't need double - parentheses here. For example - - FT_ASSERT( ptr != NULL ); - - - 3. FT_TRACE( level, (message...) ) - - The FT_TRACE macro is used to send general-purpose debugging - messages during program execution. This macro uses an *implicit* - macro named FT_COMPONENT used to name the current FreeType - component being run. - - The developer should always define FT_COMPONENT as appropriate, - for example as in - - #undef FT_COMPONENT - #define FT_COMPONENT trace_io - - The value of the FT_COMPONENT macro is an enumeration named - `trace_XXXX' where `XXXX' is one of the component names defined in - the internal file `internal/fttrace.h'. If you modify FreeType - source and insert new `trace_XXXX' macro, you must register it in - `fttrace.h'. If you insert or remove many trace macros, you can - check the undefined or the unused trace macro by - `src/tools/chktrcmp.py'. - - Each such component is assigned a `debug level', ranging from 0 to - 7, through the use of the FT2_DEBUG environment variable - (described below) when a program linked with FreeType starts. - - When FT_TRACE is called, its level is compared to the one of the - corresponding component. Messages with trace levels *higher* than - the corresponding component level are filtered and never printed. - - This means that trace messages with level 0 are always printed, - those with level 2 are only printed when the component level is - *at least* 2. - - The second parameter to FT_TRACE must contain parentheses and - correspond to a printf-like call, as in - - FT_TRACE( 2, ( "your %s is not %s\n", "foo", "bar" ) ) - - The shortcut macros FT_TRACE0, FT_TRACE1, FT_TRACE2, ..., - FT_TRACE7 can be used with constant level indices, and are much - cleaner to use, as in - - FT_TRACE2(( "your %s is not %s\n", "foo", "bar" )); - - -III. Environment variables --------------------------- - -The following environment variables control debugging output and -behaviour of FreeType at runtime. - - - FT2_DEBUG - - This variable is only used when FreeType is built with - FT_DEBUG_LEVEL_TRACE defined. It contains a list of component - level definitions, following this format: - - component1:level1 component2:level2 component3:level3 ... - - where `componentX' is the name of a tracing component, as defined - in `fttrace.h', but without the `trace_' prefix. `levelX' is the - corresponding level to use at runtime. - - `any' is a special component name that will be interpreted as - `any/all components'. For example, the following definitions - - set FT2_DEBUG=any:2 memory:5 io:4 (on Windows) - export FT2_DEBUG="any:2 memory:5 io:4" (on Linux with bash) - - both stipulate that all components should have level 2, except for - the memory and io components which will be set to trace levels 5 - and 4, respectively. - - - FT2_DEBUG_MEMORY - - This environment variable, when defined, tells FreeType to use a - debugging memory manager that will track leaking memory blocks as - well as other common errors like double frees. It is also capable - of reporting _where_ the leaking blocks were allocated, which - considerably saves time when debugging new additions to the - library. - - This code is only compiled when FreeType is built with the - FT_DEBUG_MEMORY macro #defined in `ftoption.h' though, it will be - ignored in other builds. - - - FT2_ALLOC_TOTAL_MAX - - This variable is ignored if FT2_DEBUG_MEMORY is not defined. It - allows you to specify a maximum heap size for all memory - allocations performed by FreeType. This is very useful to test - the robustness of the font engine and programs that use it in - tight memory conditions. - - If it is undefined, or if its value is not strictly positive, then - no allocation bounds are checked at runtime. - - - FT2_ALLOC_COUNT_MAX - - This variable is ignored if FT2_DEBUG_MEMORY is not defined. It - allows you to specify a maximum number of memory allocations - performed by FreeType before returning the error - FT_Err_Out_Of_Memory. This is useful for debugging and testing - the engine's robustness. - - If it is undefined, or if its value is not strictly positive, then - no allocation bounds are checked at runtime. - ------------------------------------------------------------------------- - -Copyright 2002-2005, 2009, 2013 by -David Turner, Robert Wilhelm, and Werner Lemberg. - -This file is part of the FreeType project, and may only be used, -modified, and distributed under the terms of the FreeType project -license, LICENSE.TXT. By continuing to use, modify, or distribute this -file you indicate that you have read the license and understand and -accept it fully. - - ---- end of DEBUG --- diff --git a/components/gui/SConscript b/components/gui/SConscript index fcf0ea044e495fa2f983ad59313bd3578d546166..1b9064915133b4b9fab783a6d9ae1c35037bbfd6 100644 --- a/components/gui/SConscript +++ b/components/gui/SConscript @@ -47,6 +47,14 @@ src/window.c ''') CPPPATH = [cwd + '/include'] -group = DefineGroup('GUIEngine', src, depend = ['RT_USING_GUIENGINE'], CPPPATH = CPPPATH) +group = [] +if GetDepend('RT_USING_GUIENGINE'): + group = DefineGroup('GUIEngine', src, depend = ['RT_USING_GUIENGINE'], CPPPATH = CPPPATH) + + list = os.listdir(cwd) + for d in list: + path = os.path.join(cwd, d) + if os.path.isfile(os.path.join(path, 'SConscript')): + group = group + SConscript(os.path.join(d, 'SConscript')) Return('group') diff --git a/components/external/freetype/.gitignore b/components/gui/libraries/freetype/.gitignore similarity index 100% rename from components/external/freetype/.gitignore rename to components/gui/libraries/freetype/.gitignore diff --git a/components/external/freetype/CMakeLists.txt b/components/gui/libraries/freetype/CMakeLists.txt similarity index 100% rename from components/external/freetype/CMakeLists.txt rename to components/gui/libraries/freetype/CMakeLists.txt diff --git a/components/external/freetype/ChangeLog b/components/gui/libraries/freetype/ChangeLog similarity index 100% rename from components/external/freetype/ChangeLog rename to components/gui/libraries/freetype/ChangeLog diff --git a/components/external/freetype/ChangeLog.20 b/components/gui/libraries/freetype/ChangeLog.20 similarity index 100% rename from components/external/freetype/ChangeLog.20 rename to components/gui/libraries/freetype/ChangeLog.20 diff --git a/components/external/freetype/ChangeLog.21 b/components/gui/libraries/freetype/ChangeLog.21 similarity index 100% rename from components/external/freetype/ChangeLog.21 rename to components/gui/libraries/freetype/ChangeLog.21 diff --git a/components/external/freetype/ChangeLog.22 b/components/gui/libraries/freetype/ChangeLog.22 similarity index 100% rename from components/external/freetype/ChangeLog.22 rename to components/gui/libraries/freetype/ChangeLog.22 diff --git a/components/external/freetype/ChangeLog.23 b/components/gui/libraries/freetype/ChangeLog.23 similarity index 100% rename from components/external/freetype/ChangeLog.23 rename to components/gui/libraries/freetype/ChangeLog.23 diff --git a/components/external/freetype/ChangeLog.24 b/components/gui/libraries/freetype/ChangeLog.24 similarity index 100% rename from components/external/freetype/ChangeLog.24 rename to components/gui/libraries/freetype/ChangeLog.24 diff --git a/components/external/freetype/Jamfile b/components/gui/libraries/freetype/Jamfile similarity index 100% rename from components/external/freetype/Jamfile rename to components/gui/libraries/freetype/Jamfile diff --git a/components/external/freetype/Jamrules b/components/gui/libraries/freetype/Jamrules similarity index 100% rename from components/external/freetype/Jamrules rename to components/gui/libraries/freetype/Jamrules diff --git a/components/external/freetype/Makefile b/components/gui/libraries/freetype/Makefile similarity index 100% rename from components/external/freetype/Makefile rename to components/gui/libraries/freetype/Makefile diff --git a/components/external/freetype/README b/components/gui/libraries/freetype/README similarity index 100% rename from components/external/freetype/README rename to components/gui/libraries/freetype/README diff --git a/components/external/freetype/README.git b/components/gui/libraries/freetype/README.git similarity index 100% rename from components/external/freetype/README.git rename to components/gui/libraries/freetype/README.git diff --git a/components/external/freetype/SConscript b/components/gui/libraries/freetype/SConscript similarity index 100% rename from components/external/freetype/SConscript rename to components/gui/libraries/freetype/SConscript diff --git a/components/external/freetype/autogen.sh b/components/gui/libraries/freetype/autogen.sh similarity index 100% rename from components/external/freetype/autogen.sh rename to components/gui/libraries/freetype/autogen.sh diff --git a/components/external/freetype/builds/amiga/README b/components/gui/libraries/freetype/builds/amiga/README similarity index 100% rename from components/external/freetype/builds/amiga/README rename to components/gui/libraries/freetype/builds/amiga/README diff --git a/components/external/freetype/builds/amiga/include/config/ftconfig.h b/components/gui/libraries/freetype/builds/amiga/include/config/ftconfig.h similarity index 100% rename from components/external/freetype/builds/amiga/include/config/ftconfig.h rename to components/gui/libraries/freetype/builds/amiga/include/config/ftconfig.h diff --git a/components/external/freetype/builds/amiga/include/config/ftmodule.h b/components/gui/libraries/freetype/builds/amiga/include/config/ftmodule.h similarity index 100% rename from components/external/freetype/builds/amiga/include/config/ftmodule.h rename to components/gui/libraries/freetype/builds/amiga/include/config/ftmodule.h diff --git a/components/external/freetype/builds/amiga/makefile b/components/gui/libraries/freetype/builds/amiga/makefile similarity index 100% rename from components/external/freetype/builds/amiga/makefile rename to components/gui/libraries/freetype/builds/amiga/makefile diff --git a/components/external/freetype/builds/amiga/makefile.os4 b/components/gui/libraries/freetype/builds/amiga/makefile.os4 similarity index 100% rename from components/external/freetype/builds/amiga/makefile.os4 rename to components/gui/libraries/freetype/builds/amiga/makefile.os4 diff --git a/components/external/freetype/builds/amiga/smakefile b/components/gui/libraries/freetype/builds/amiga/smakefile similarity index 100% rename from components/external/freetype/builds/amiga/smakefile rename to components/gui/libraries/freetype/builds/amiga/smakefile diff --git a/components/external/freetype/builds/amiga/src/base/ftdebug.c b/components/gui/libraries/freetype/builds/amiga/src/base/ftdebug.c similarity index 100% rename from components/external/freetype/builds/amiga/src/base/ftdebug.c rename to components/gui/libraries/freetype/builds/amiga/src/base/ftdebug.c diff --git a/components/external/freetype/builds/amiga/src/base/ftsystem.c b/components/gui/libraries/freetype/builds/amiga/src/base/ftsystem.c similarity index 100% rename from components/external/freetype/builds/amiga/src/base/ftsystem.c rename to components/gui/libraries/freetype/builds/amiga/src/base/ftsystem.c diff --git a/components/external/freetype/builds/ansi/ansi-def.mk b/components/gui/libraries/freetype/builds/ansi/ansi-def.mk similarity index 100% rename from components/external/freetype/builds/ansi/ansi-def.mk rename to components/gui/libraries/freetype/builds/ansi/ansi-def.mk diff --git a/components/external/freetype/builds/ansi/ansi.mk b/components/gui/libraries/freetype/builds/ansi/ansi.mk similarity index 100% rename from components/external/freetype/builds/ansi/ansi.mk rename to components/gui/libraries/freetype/builds/ansi/ansi.mk diff --git a/components/external/freetype/builds/atari/ATARI.H b/components/gui/libraries/freetype/builds/atari/ATARI.H similarity index 100% rename from components/external/freetype/builds/atari/ATARI.H rename to components/gui/libraries/freetype/builds/atari/ATARI.H diff --git a/components/external/freetype/builds/atari/FNames.SIC b/components/gui/libraries/freetype/builds/atari/FNames.SIC similarity index 100% rename from components/external/freetype/builds/atari/FNames.SIC rename to components/gui/libraries/freetype/builds/atari/FNames.SIC diff --git a/components/external/freetype/builds/atari/FREETYPE.PRJ b/components/gui/libraries/freetype/builds/atari/FREETYPE.PRJ similarity index 100% rename from components/external/freetype/builds/atari/FREETYPE.PRJ rename to components/gui/libraries/freetype/builds/atari/FREETYPE.PRJ diff --git a/components/external/freetype/builds/atari/README.TXT b/components/gui/libraries/freetype/builds/atari/README.TXT similarity index 100% rename from components/external/freetype/builds/atari/README.TXT rename to components/gui/libraries/freetype/builds/atari/README.TXT diff --git a/components/external/freetype/builds/atari/deflinejoiner.awk b/components/gui/libraries/freetype/builds/atari/deflinejoiner.awk similarity index 100% rename from components/external/freetype/builds/atari/deflinejoiner.awk rename to components/gui/libraries/freetype/builds/atari/deflinejoiner.awk diff --git a/components/external/freetype/builds/atari/gen-purec-patch.sh b/components/gui/libraries/freetype/builds/atari/gen-purec-patch.sh similarity index 100% rename from components/external/freetype/builds/atari/gen-purec-patch.sh rename to components/gui/libraries/freetype/builds/atari/gen-purec-patch.sh diff --git a/components/external/freetype/builds/beos/beos-def.mk b/components/gui/libraries/freetype/builds/beos/beos-def.mk similarity index 100% rename from components/external/freetype/builds/beos/beos-def.mk rename to components/gui/libraries/freetype/builds/beos/beos-def.mk diff --git a/components/external/freetype/builds/beos/beos.mk b/components/gui/libraries/freetype/builds/beos/beos.mk similarity index 100% rename from components/external/freetype/builds/beos/beos.mk rename to components/gui/libraries/freetype/builds/beos/beos.mk diff --git a/components/external/freetype/builds/beos/detect.mk b/components/gui/libraries/freetype/builds/beos/detect.mk similarity index 100% rename from components/external/freetype/builds/beos/detect.mk rename to components/gui/libraries/freetype/builds/beos/detect.mk diff --git a/components/external/freetype/builds/cmake/iOS.cmake b/components/gui/libraries/freetype/builds/cmake/iOS.cmake similarity index 100% rename from components/external/freetype/builds/cmake/iOS.cmake rename to components/gui/libraries/freetype/builds/cmake/iOS.cmake diff --git a/components/external/freetype/builds/compiler/ansi-cc.mk b/components/gui/libraries/freetype/builds/compiler/ansi-cc.mk similarity index 100% rename from components/external/freetype/builds/compiler/ansi-cc.mk rename to components/gui/libraries/freetype/builds/compiler/ansi-cc.mk diff --git a/components/external/freetype/builds/compiler/bcc-dev.mk b/components/gui/libraries/freetype/builds/compiler/bcc-dev.mk similarity index 100% rename from components/external/freetype/builds/compiler/bcc-dev.mk rename to components/gui/libraries/freetype/builds/compiler/bcc-dev.mk diff --git a/components/external/freetype/builds/compiler/bcc.mk b/components/gui/libraries/freetype/builds/compiler/bcc.mk similarity index 100% rename from components/external/freetype/builds/compiler/bcc.mk rename to components/gui/libraries/freetype/builds/compiler/bcc.mk diff --git a/components/external/freetype/builds/compiler/emx.mk b/components/gui/libraries/freetype/builds/compiler/emx.mk similarity index 100% rename from components/external/freetype/builds/compiler/emx.mk rename to components/gui/libraries/freetype/builds/compiler/emx.mk diff --git a/components/external/freetype/builds/compiler/gcc-dev.mk b/components/gui/libraries/freetype/builds/compiler/gcc-dev.mk similarity index 100% rename from components/external/freetype/builds/compiler/gcc-dev.mk rename to components/gui/libraries/freetype/builds/compiler/gcc-dev.mk diff --git a/components/external/freetype/builds/compiler/gcc.mk b/components/gui/libraries/freetype/builds/compiler/gcc.mk similarity index 100% rename from components/external/freetype/builds/compiler/gcc.mk rename to components/gui/libraries/freetype/builds/compiler/gcc.mk diff --git a/components/external/freetype/builds/compiler/intelc.mk b/components/gui/libraries/freetype/builds/compiler/intelc.mk similarity index 100% rename from components/external/freetype/builds/compiler/intelc.mk rename to components/gui/libraries/freetype/builds/compiler/intelc.mk diff --git a/components/external/freetype/builds/compiler/unix-lcc.mk b/components/gui/libraries/freetype/builds/compiler/unix-lcc.mk similarity index 100% rename from components/external/freetype/builds/compiler/unix-lcc.mk rename to components/gui/libraries/freetype/builds/compiler/unix-lcc.mk diff --git a/components/external/freetype/builds/compiler/visualage.mk b/components/gui/libraries/freetype/builds/compiler/visualage.mk similarity index 100% rename from components/external/freetype/builds/compiler/visualage.mk rename to components/gui/libraries/freetype/builds/compiler/visualage.mk diff --git a/components/external/freetype/builds/compiler/visualc.mk b/components/gui/libraries/freetype/builds/compiler/visualc.mk similarity index 100% rename from components/external/freetype/builds/compiler/visualc.mk rename to components/gui/libraries/freetype/builds/compiler/visualc.mk diff --git a/components/external/freetype/builds/compiler/watcom.mk b/components/gui/libraries/freetype/builds/compiler/watcom.mk similarity index 100% rename from components/external/freetype/builds/compiler/watcom.mk rename to components/gui/libraries/freetype/builds/compiler/watcom.mk diff --git a/components/external/freetype/builds/compiler/win-lcc.mk b/components/gui/libraries/freetype/builds/compiler/win-lcc.mk similarity index 100% rename from components/external/freetype/builds/compiler/win-lcc.mk rename to components/gui/libraries/freetype/builds/compiler/win-lcc.mk diff --git a/components/external/freetype/builds/detect.mk b/components/gui/libraries/freetype/builds/detect.mk similarity index 100% rename from components/external/freetype/builds/detect.mk rename to components/gui/libraries/freetype/builds/detect.mk diff --git a/components/external/freetype/builds/dos/detect.mk b/components/gui/libraries/freetype/builds/dos/detect.mk similarity index 100% rename from components/external/freetype/builds/dos/detect.mk rename to components/gui/libraries/freetype/builds/dos/detect.mk diff --git a/components/external/freetype/builds/dos/dos-def.mk b/components/gui/libraries/freetype/builds/dos/dos-def.mk similarity index 100% rename from components/external/freetype/builds/dos/dos-def.mk rename to components/gui/libraries/freetype/builds/dos/dos-def.mk diff --git a/components/external/freetype/builds/dos/dos-emx.mk b/components/gui/libraries/freetype/builds/dos/dos-emx.mk similarity index 100% rename from components/external/freetype/builds/dos/dos-emx.mk rename to components/gui/libraries/freetype/builds/dos/dos-emx.mk diff --git a/components/external/freetype/builds/dos/dos-gcc.mk b/components/gui/libraries/freetype/builds/dos/dos-gcc.mk similarity index 100% rename from components/external/freetype/builds/dos/dos-gcc.mk rename to components/gui/libraries/freetype/builds/dos/dos-gcc.mk diff --git a/components/external/freetype/builds/dos/dos-wat.mk b/components/gui/libraries/freetype/builds/dos/dos-wat.mk similarity index 100% rename from components/external/freetype/builds/dos/dos-wat.mk rename to components/gui/libraries/freetype/builds/dos/dos-wat.mk diff --git a/components/external/freetype/builds/exports.mk b/components/gui/libraries/freetype/builds/exports.mk similarity index 100% rename from components/external/freetype/builds/exports.mk rename to components/gui/libraries/freetype/builds/exports.mk diff --git a/components/external/freetype/builds/freetype.mk b/components/gui/libraries/freetype/builds/freetype.mk similarity index 100% rename from components/external/freetype/builds/freetype.mk rename to components/gui/libraries/freetype/builds/freetype.mk diff --git a/components/external/freetype/builds/link_dos.mk b/components/gui/libraries/freetype/builds/link_dos.mk similarity index 100% rename from components/external/freetype/builds/link_dos.mk rename to components/gui/libraries/freetype/builds/link_dos.mk diff --git a/components/external/freetype/builds/link_std.mk b/components/gui/libraries/freetype/builds/link_std.mk similarity index 100% rename from components/external/freetype/builds/link_std.mk rename to components/gui/libraries/freetype/builds/link_std.mk diff --git a/components/external/freetype/builds/mac/FreeType.m68k_cfm.make.txt b/components/gui/libraries/freetype/builds/mac/FreeType.m68k_cfm.make.txt similarity index 100% rename from components/external/freetype/builds/mac/FreeType.m68k_cfm.make.txt rename to components/gui/libraries/freetype/builds/mac/FreeType.m68k_cfm.make.txt diff --git a/components/external/freetype/builds/mac/FreeType.m68k_far.make.txt b/components/gui/libraries/freetype/builds/mac/FreeType.m68k_far.make.txt similarity index 100% rename from components/external/freetype/builds/mac/FreeType.m68k_far.make.txt rename to components/gui/libraries/freetype/builds/mac/FreeType.m68k_far.make.txt diff --git a/components/external/freetype/builds/mac/FreeType.ppc_carbon.make.txt b/components/gui/libraries/freetype/builds/mac/FreeType.ppc_carbon.make.txt similarity index 100% rename from components/external/freetype/builds/mac/FreeType.ppc_carbon.make.txt rename to components/gui/libraries/freetype/builds/mac/FreeType.ppc_carbon.make.txt diff --git a/components/external/freetype/builds/mac/FreeType.ppc_classic.make.txt b/components/gui/libraries/freetype/builds/mac/FreeType.ppc_classic.make.txt similarity index 100% rename from components/external/freetype/builds/mac/FreeType.ppc_classic.make.txt rename to components/gui/libraries/freetype/builds/mac/FreeType.ppc_classic.make.txt diff --git a/components/external/freetype/builds/mac/README b/components/gui/libraries/freetype/builds/mac/README similarity index 100% rename from components/external/freetype/builds/mac/README rename to components/gui/libraries/freetype/builds/mac/README diff --git a/components/external/freetype/builds/mac/ascii2mpw.py b/components/gui/libraries/freetype/builds/mac/ascii2mpw.py similarity index 100% rename from components/external/freetype/builds/mac/ascii2mpw.py rename to components/gui/libraries/freetype/builds/mac/ascii2mpw.py diff --git a/components/external/freetype/builds/mac/freetype-Info.plist b/components/gui/libraries/freetype/builds/mac/freetype-Info.plist similarity index 100% rename from components/external/freetype/builds/mac/freetype-Info.plist rename to components/gui/libraries/freetype/builds/mac/freetype-Info.plist diff --git a/components/external/freetype/builds/mac/ftlib.prj.xml b/components/gui/libraries/freetype/builds/mac/ftlib.prj.xml similarity index 100% rename from components/external/freetype/builds/mac/ftlib.prj.xml rename to components/gui/libraries/freetype/builds/mac/ftlib.prj.xml diff --git a/components/external/freetype/builds/mac/ftmac.c b/components/gui/libraries/freetype/builds/mac/ftmac.c similarity index 100% rename from components/external/freetype/builds/mac/ftmac.c rename to components/gui/libraries/freetype/builds/mac/ftmac.c diff --git a/components/external/freetype/builds/modules.mk b/components/gui/libraries/freetype/builds/modules.mk similarity index 100% rename from components/external/freetype/builds/modules.mk rename to components/gui/libraries/freetype/builds/modules.mk diff --git a/components/external/freetype/builds/newline b/components/gui/libraries/freetype/builds/newline similarity index 100% rename from components/external/freetype/builds/newline rename to components/gui/libraries/freetype/builds/newline diff --git a/components/external/freetype/builds/os2/detect.mk b/components/gui/libraries/freetype/builds/os2/detect.mk similarity index 100% rename from components/external/freetype/builds/os2/detect.mk rename to components/gui/libraries/freetype/builds/os2/detect.mk diff --git a/components/external/freetype/builds/os2/os2-def.mk b/components/gui/libraries/freetype/builds/os2/os2-def.mk similarity index 100% rename from components/external/freetype/builds/os2/os2-def.mk rename to components/gui/libraries/freetype/builds/os2/os2-def.mk diff --git a/components/external/freetype/builds/os2/os2-dev.mk b/components/gui/libraries/freetype/builds/os2/os2-dev.mk similarity index 100% rename from components/external/freetype/builds/os2/os2-dev.mk rename to components/gui/libraries/freetype/builds/os2/os2-dev.mk diff --git a/components/external/freetype/builds/os2/os2-gcc.mk b/components/gui/libraries/freetype/builds/os2/os2-gcc.mk similarity index 100% rename from components/external/freetype/builds/os2/os2-gcc.mk rename to components/gui/libraries/freetype/builds/os2/os2-gcc.mk diff --git a/components/external/freetype/builds/rt-thread/ftoption.h b/components/gui/libraries/freetype/builds/rt-thread/ftoption.h similarity index 100% rename from components/external/freetype/builds/rt-thread/ftoption.h rename to components/gui/libraries/freetype/builds/rt-thread/ftoption.h diff --git a/components/external/freetype/builds/rt-thread/ftsystem.c b/components/gui/libraries/freetype/builds/rt-thread/ftsystem.c similarity index 100% rename from components/external/freetype/builds/rt-thread/ftsystem.c rename to components/gui/libraries/freetype/builds/rt-thread/ftsystem.c diff --git a/components/external/freetype/builds/rt-thread/gb2312tounicode.c b/components/gui/libraries/freetype/builds/rt-thread/gb2312tounicode.c similarity index 100% rename from components/external/freetype/builds/rt-thread/gb2312tounicode.c rename to components/gui/libraries/freetype/builds/rt-thread/gb2312tounicode.c diff --git a/components/external/freetype/builds/rt-thread/record.txt b/components/gui/libraries/freetype/builds/rt-thread/record.txt similarity index 100% rename from components/external/freetype/builds/rt-thread/record.txt rename to components/gui/libraries/freetype/builds/rt-thread/record.txt diff --git a/components/external/freetype/builds/symbian/bld.inf b/components/gui/libraries/freetype/builds/symbian/bld.inf similarity index 100% rename from components/external/freetype/builds/symbian/bld.inf rename to components/gui/libraries/freetype/builds/symbian/bld.inf diff --git a/components/external/freetype/builds/symbian/freetype.mmp b/components/gui/libraries/freetype/builds/symbian/freetype.mmp similarity index 100% rename from components/external/freetype/builds/symbian/freetype.mmp rename to components/gui/libraries/freetype/builds/symbian/freetype.mmp diff --git a/components/external/freetype/builds/toplevel.mk b/components/gui/libraries/freetype/builds/toplevel.mk similarity index 100% rename from components/external/freetype/builds/toplevel.mk rename to components/gui/libraries/freetype/builds/toplevel.mk diff --git a/components/external/freetype/builds/unix/.gitignore b/components/gui/libraries/freetype/builds/unix/.gitignore similarity index 100% rename from components/external/freetype/builds/unix/.gitignore rename to components/gui/libraries/freetype/builds/unix/.gitignore diff --git a/components/external/freetype/builds/unix/configure.raw b/components/gui/libraries/freetype/builds/unix/configure.raw similarity index 100% rename from components/external/freetype/builds/unix/configure.raw rename to components/gui/libraries/freetype/builds/unix/configure.raw diff --git a/components/external/freetype/builds/unix/detect.mk b/components/gui/libraries/freetype/builds/unix/detect.mk similarity index 100% rename from components/external/freetype/builds/unix/detect.mk rename to components/gui/libraries/freetype/builds/unix/detect.mk diff --git a/components/external/freetype/builds/unix/freetype-config.in b/components/gui/libraries/freetype/builds/unix/freetype-config.in similarity index 100% rename from components/external/freetype/builds/unix/freetype-config.in rename to components/gui/libraries/freetype/builds/unix/freetype-config.in diff --git a/components/external/freetype/builds/unix/freetype2.in b/components/gui/libraries/freetype/builds/unix/freetype2.in similarity index 100% rename from components/external/freetype/builds/unix/freetype2.in rename to components/gui/libraries/freetype/builds/unix/freetype2.in diff --git a/components/external/freetype/builds/unix/freetype2.m4 b/components/gui/libraries/freetype/builds/unix/freetype2.m4 similarity index 100% rename from components/external/freetype/builds/unix/freetype2.m4 rename to components/gui/libraries/freetype/builds/unix/freetype2.m4 diff --git a/components/external/freetype/builds/unix/ft-munmap.m4 b/components/gui/libraries/freetype/builds/unix/ft-munmap.m4 similarity index 100% rename from components/external/freetype/builds/unix/ft-munmap.m4 rename to components/gui/libraries/freetype/builds/unix/ft-munmap.m4 diff --git a/components/external/freetype/builds/unix/ftconfig.in b/components/gui/libraries/freetype/builds/unix/ftconfig.in similarity index 100% rename from components/external/freetype/builds/unix/ftconfig.in rename to components/gui/libraries/freetype/builds/unix/ftconfig.in diff --git a/components/external/freetype/builds/unix/ftsystem.c b/components/gui/libraries/freetype/builds/unix/ftsystem.c similarity index 100% rename from components/external/freetype/builds/unix/ftsystem.c rename to components/gui/libraries/freetype/builds/unix/ftsystem.c diff --git a/components/external/freetype/builds/unix/install.mk b/components/gui/libraries/freetype/builds/unix/install.mk similarity index 100% rename from components/external/freetype/builds/unix/install.mk rename to components/gui/libraries/freetype/builds/unix/install.mk diff --git a/components/external/freetype/builds/unix/mkinstalldirs b/components/gui/libraries/freetype/builds/unix/mkinstalldirs similarity index 100% rename from components/external/freetype/builds/unix/mkinstalldirs rename to components/gui/libraries/freetype/builds/unix/mkinstalldirs diff --git a/components/external/freetype/builds/unix/pkg.m4 b/components/gui/libraries/freetype/builds/unix/pkg.m4 similarity index 100% rename from components/external/freetype/builds/unix/pkg.m4 rename to components/gui/libraries/freetype/builds/unix/pkg.m4 diff --git a/components/external/freetype/builds/unix/unix-cc.in b/components/gui/libraries/freetype/builds/unix/unix-cc.in similarity index 100% rename from components/external/freetype/builds/unix/unix-cc.in rename to components/gui/libraries/freetype/builds/unix/unix-cc.in diff --git a/components/external/freetype/builds/unix/unix-def.in b/components/gui/libraries/freetype/builds/unix/unix-def.in similarity index 100% rename from components/external/freetype/builds/unix/unix-def.in rename to components/gui/libraries/freetype/builds/unix/unix-def.in diff --git a/components/external/freetype/builds/unix/unix-dev.mk b/components/gui/libraries/freetype/builds/unix/unix-dev.mk similarity index 100% rename from components/external/freetype/builds/unix/unix-dev.mk rename to components/gui/libraries/freetype/builds/unix/unix-dev.mk diff --git a/components/external/freetype/builds/unix/unix-lcc.mk b/components/gui/libraries/freetype/builds/unix/unix-lcc.mk similarity index 100% rename from components/external/freetype/builds/unix/unix-lcc.mk rename to components/gui/libraries/freetype/builds/unix/unix-lcc.mk diff --git a/components/external/freetype/builds/unix/unix.mk b/components/gui/libraries/freetype/builds/unix/unix.mk similarity index 100% rename from components/external/freetype/builds/unix/unix.mk rename to components/gui/libraries/freetype/builds/unix/unix.mk diff --git a/components/external/freetype/builds/unix/unixddef.mk b/components/gui/libraries/freetype/builds/unix/unixddef.mk similarity index 100% rename from components/external/freetype/builds/unix/unixddef.mk rename to components/gui/libraries/freetype/builds/unix/unixddef.mk diff --git a/components/external/freetype/builds/vms/ftconfig.h b/components/gui/libraries/freetype/builds/vms/ftconfig.h similarity index 100% rename from components/external/freetype/builds/vms/ftconfig.h rename to components/gui/libraries/freetype/builds/vms/ftconfig.h diff --git a/components/external/freetype/builds/vms/ftsystem.c b/components/gui/libraries/freetype/builds/vms/ftsystem.c similarity index 100% rename from components/external/freetype/builds/vms/ftsystem.c rename to components/gui/libraries/freetype/builds/vms/ftsystem.c diff --git a/components/external/freetype/builds/wince/ftdebug.c b/components/gui/libraries/freetype/builds/wince/ftdebug.c similarity index 100% rename from components/external/freetype/builds/wince/ftdebug.c rename to components/gui/libraries/freetype/builds/wince/ftdebug.c diff --git a/components/external/freetype/builds/wince/vc2005-ce/freetype.sln b/components/gui/libraries/freetype/builds/wince/vc2005-ce/freetype.sln similarity index 100% rename from components/external/freetype/builds/wince/vc2005-ce/freetype.sln rename to components/gui/libraries/freetype/builds/wince/vc2005-ce/freetype.sln diff --git a/components/external/freetype/builds/wince/vc2005-ce/freetype.vcproj b/components/gui/libraries/freetype/builds/wince/vc2005-ce/freetype.vcproj similarity index 100% rename from components/external/freetype/builds/wince/vc2005-ce/freetype.vcproj rename to components/gui/libraries/freetype/builds/wince/vc2005-ce/freetype.vcproj diff --git a/components/external/freetype/builds/wince/vc2005-ce/index.html b/components/gui/libraries/freetype/builds/wince/vc2005-ce/index.html similarity index 100% rename from components/external/freetype/builds/wince/vc2005-ce/index.html rename to components/gui/libraries/freetype/builds/wince/vc2005-ce/index.html diff --git a/components/external/freetype/builds/wince/vc2008-ce/freetype.sln b/components/gui/libraries/freetype/builds/wince/vc2008-ce/freetype.sln similarity index 100% rename from components/external/freetype/builds/wince/vc2008-ce/freetype.sln rename to components/gui/libraries/freetype/builds/wince/vc2008-ce/freetype.sln diff --git a/components/external/freetype/builds/wince/vc2008-ce/freetype.vcproj b/components/gui/libraries/freetype/builds/wince/vc2008-ce/freetype.vcproj similarity index 100% rename from components/external/freetype/builds/wince/vc2008-ce/freetype.vcproj rename to components/gui/libraries/freetype/builds/wince/vc2008-ce/freetype.vcproj diff --git a/components/external/freetype/builds/wince/vc2008-ce/index.html b/components/gui/libraries/freetype/builds/wince/vc2008-ce/index.html similarity index 100% rename from components/external/freetype/builds/wince/vc2008-ce/index.html rename to components/gui/libraries/freetype/builds/wince/vc2008-ce/index.html diff --git a/components/external/freetype/builds/windows/.gitignore b/components/gui/libraries/freetype/builds/windows/.gitignore similarity index 100% rename from components/external/freetype/builds/windows/.gitignore rename to components/gui/libraries/freetype/builds/windows/.gitignore diff --git a/components/external/freetype/builds/windows/detect.mk b/components/gui/libraries/freetype/builds/windows/detect.mk similarity index 100% rename from components/external/freetype/builds/windows/detect.mk rename to components/gui/libraries/freetype/builds/windows/detect.mk diff --git a/components/external/freetype/builds/windows/ftdebug.c b/components/gui/libraries/freetype/builds/windows/ftdebug.c similarity index 100% rename from components/external/freetype/builds/windows/ftdebug.c rename to components/gui/libraries/freetype/builds/windows/ftdebug.c diff --git a/components/external/freetype/builds/windows/vc2005/freetype.sln b/components/gui/libraries/freetype/builds/windows/vc2005/freetype.sln similarity index 100% rename from components/external/freetype/builds/windows/vc2005/freetype.sln rename to components/gui/libraries/freetype/builds/windows/vc2005/freetype.sln diff --git a/components/external/freetype/builds/windows/vc2005/freetype.vcproj b/components/gui/libraries/freetype/builds/windows/vc2005/freetype.vcproj similarity index 100% rename from components/external/freetype/builds/windows/vc2005/freetype.vcproj rename to components/gui/libraries/freetype/builds/windows/vc2005/freetype.vcproj diff --git a/components/external/freetype/builds/windows/vc2005/index.html b/components/gui/libraries/freetype/builds/windows/vc2005/index.html similarity index 100% rename from components/external/freetype/builds/windows/vc2005/index.html rename to components/gui/libraries/freetype/builds/windows/vc2005/index.html diff --git a/components/external/freetype/builds/windows/vc2008/freetype.sln b/components/gui/libraries/freetype/builds/windows/vc2008/freetype.sln similarity index 100% rename from components/external/freetype/builds/windows/vc2008/freetype.sln rename to components/gui/libraries/freetype/builds/windows/vc2008/freetype.sln diff --git a/components/external/freetype/builds/windows/vc2008/freetype.vcproj b/components/gui/libraries/freetype/builds/windows/vc2008/freetype.vcproj similarity index 100% rename from components/external/freetype/builds/windows/vc2008/freetype.vcproj rename to components/gui/libraries/freetype/builds/windows/vc2008/freetype.vcproj diff --git a/components/external/freetype/builds/windows/vc2008/index.html b/components/gui/libraries/freetype/builds/windows/vc2008/index.html similarity index 100% rename from components/external/freetype/builds/windows/vc2008/index.html rename to components/gui/libraries/freetype/builds/windows/vc2008/index.html diff --git a/components/external/freetype/builds/windows/vc2010/freetype.sln b/components/gui/libraries/freetype/builds/windows/vc2010/freetype.sln similarity index 100% rename from components/external/freetype/builds/windows/vc2010/freetype.sln rename to components/gui/libraries/freetype/builds/windows/vc2010/freetype.sln diff --git a/components/external/freetype/builds/windows/vc2010/freetype.user.props b/components/gui/libraries/freetype/builds/windows/vc2010/freetype.user.props similarity index 100% rename from components/external/freetype/builds/windows/vc2010/freetype.user.props rename to components/gui/libraries/freetype/builds/windows/vc2010/freetype.user.props diff --git a/components/external/freetype/builds/windows/vc2010/freetype.vcxproj b/components/gui/libraries/freetype/builds/windows/vc2010/freetype.vcxproj similarity index 100% rename from components/external/freetype/builds/windows/vc2010/freetype.vcxproj rename to components/gui/libraries/freetype/builds/windows/vc2010/freetype.vcxproj diff --git a/components/external/freetype/builds/windows/vc2010/freetype.vcxproj.filters b/components/gui/libraries/freetype/builds/windows/vc2010/freetype.vcxproj.filters similarity index 100% rename from components/external/freetype/builds/windows/vc2010/freetype.vcxproj.filters rename to components/gui/libraries/freetype/builds/windows/vc2010/freetype.vcxproj.filters diff --git a/components/external/freetype/builds/windows/vc2010/index.html b/components/gui/libraries/freetype/builds/windows/vc2010/index.html similarity index 100% rename from components/external/freetype/builds/windows/vc2010/index.html rename to components/gui/libraries/freetype/builds/windows/vc2010/index.html diff --git a/components/external/freetype/builds/windows/visualc/freetype.dsp b/components/gui/libraries/freetype/builds/windows/visualc/freetype.dsp similarity index 100% rename from components/external/freetype/builds/windows/visualc/freetype.dsp rename to components/gui/libraries/freetype/builds/windows/visualc/freetype.dsp diff --git a/components/external/freetype/builds/windows/visualc/freetype.dsw b/components/gui/libraries/freetype/builds/windows/visualc/freetype.dsw similarity index 100% rename from components/external/freetype/builds/windows/visualc/freetype.dsw rename to components/gui/libraries/freetype/builds/windows/visualc/freetype.dsw diff --git a/components/external/freetype/builds/windows/visualc/freetype.sln b/components/gui/libraries/freetype/builds/windows/visualc/freetype.sln similarity index 100% rename from components/external/freetype/builds/windows/visualc/freetype.sln rename to components/gui/libraries/freetype/builds/windows/visualc/freetype.sln diff --git a/components/external/freetype/builds/windows/visualc/freetype.vcproj b/components/gui/libraries/freetype/builds/windows/visualc/freetype.vcproj similarity index 100% rename from components/external/freetype/builds/windows/visualc/freetype.vcproj rename to components/gui/libraries/freetype/builds/windows/visualc/freetype.vcproj diff --git a/components/external/freetype/builds/windows/visualc/index.html b/components/gui/libraries/freetype/builds/windows/visualc/index.html similarity index 100% rename from components/external/freetype/builds/windows/visualc/index.html rename to components/gui/libraries/freetype/builds/windows/visualc/index.html diff --git a/components/external/freetype/builds/windows/visualce/freetype.dsp b/components/gui/libraries/freetype/builds/windows/visualce/freetype.dsp similarity index 100% rename from components/external/freetype/builds/windows/visualce/freetype.dsp rename to components/gui/libraries/freetype/builds/windows/visualce/freetype.dsp diff --git a/components/external/freetype/builds/windows/visualce/freetype.dsw b/components/gui/libraries/freetype/builds/windows/visualce/freetype.dsw similarity index 100% rename from components/external/freetype/builds/windows/visualce/freetype.dsw rename to components/gui/libraries/freetype/builds/windows/visualce/freetype.dsw diff --git a/components/external/freetype/builds/windows/visualce/freetype.vcproj b/components/gui/libraries/freetype/builds/windows/visualce/freetype.vcproj similarity index 100% rename from components/external/freetype/builds/windows/visualce/freetype.vcproj rename to components/gui/libraries/freetype/builds/windows/visualce/freetype.vcproj diff --git a/components/external/freetype/builds/windows/visualce/index.html b/components/gui/libraries/freetype/builds/windows/visualce/index.html similarity index 100% rename from components/external/freetype/builds/windows/visualce/index.html rename to components/gui/libraries/freetype/builds/windows/visualce/index.html diff --git a/components/external/freetype/builds/windows/w32-bcc.mk b/components/gui/libraries/freetype/builds/windows/w32-bcc.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-bcc.mk rename to components/gui/libraries/freetype/builds/windows/w32-bcc.mk diff --git a/components/external/freetype/builds/windows/w32-bccd.mk b/components/gui/libraries/freetype/builds/windows/w32-bccd.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-bccd.mk rename to components/gui/libraries/freetype/builds/windows/w32-bccd.mk diff --git a/components/external/freetype/builds/windows/w32-dev.mk b/components/gui/libraries/freetype/builds/windows/w32-dev.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-dev.mk rename to components/gui/libraries/freetype/builds/windows/w32-dev.mk diff --git a/components/external/freetype/builds/windows/w32-gcc.mk b/components/gui/libraries/freetype/builds/windows/w32-gcc.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-gcc.mk rename to components/gui/libraries/freetype/builds/windows/w32-gcc.mk diff --git a/components/external/freetype/builds/windows/w32-icc.mk b/components/gui/libraries/freetype/builds/windows/w32-icc.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-icc.mk rename to components/gui/libraries/freetype/builds/windows/w32-icc.mk diff --git a/components/external/freetype/builds/windows/w32-intl.mk b/components/gui/libraries/freetype/builds/windows/w32-intl.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-intl.mk rename to components/gui/libraries/freetype/builds/windows/w32-intl.mk diff --git a/components/external/freetype/builds/windows/w32-lcc.mk b/components/gui/libraries/freetype/builds/windows/w32-lcc.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-lcc.mk rename to components/gui/libraries/freetype/builds/windows/w32-lcc.mk diff --git a/components/external/freetype/builds/windows/w32-mingw32.mk b/components/gui/libraries/freetype/builds/windows/w32-mingw32.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-mingw32.mk rename to components/gui/libraries/freetype/builds/windows/w32-mingw32.mk diff --git a/components/external/freetype/builds/windows/w32-vcc.mk b/components/gui/libraries/freetype/builds/windows/w32-vcc.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-vcc.mk rename to components/gui/libraries/freetype/builds/windows/w32-vcc.mk diff --git a/components/external/freetype/builds/windows/w32-wat.mk b/components/gui/libraries/freetype/builds/windows/w32-wat.mk similarity index 100% rename from components/external/freetype/builds/windows/w32-wat.mk rename to components/gui/libraries/freetype/builds/windows/w32-wat.mk diff --git a/components/external/freetype/builds/windows/win32-def.mk b/components/gui/libraries/freetype/builds/windows/win32-def.mk similarity index 100% rename from components/external/freetype/builds/windows/win32-def.mk rename to components/gui/libraries/freetype/builds/windows/win32-def.mk diff --git a/components/external/freetype/configure b/components/gui/libraries/freetype/configure similarity index 100% rename from components/external/freetype/configure rename to components/gui/libraries/freetype/configure diff --git a/components/external/freetype/devel/ft2build.h b/components/gui/libraries/freetype/devel/ft2build.h similarity index 100% rename from components/external/freetype/devel/ft2build.h rename to components/gui/libraries/freetype/devel/ft2build.h diff --git a/components/external/freetype/devel/ftoption.h b/components/gui/libraries/freetype/devel/ftoption.h similarity index 100% rename from components/external/freetype/devel/ftoption.h rename to components/gui/libraries/freetype/devel/ftoption.h diff --git a/components/external/freetype/docs/CHANGES b/components/gui/libraries/freetype/docs/CHANGES similarity index 100% rename from components/external/freetype/docs/CHANGES rename to components/gui/libraries/freetype/docs/CHANGES diff --git a/components/external/freetype/docs/CMAKE b/components/gui/libraries/freetype/docs/CMAKE similarity index 100% rename from components/external/freetype/docs/CMAKE rename to components/gui/libraries/freetype/docs/CMAKE diff --git a/components/external/freetype/docs/CUSTOMIZE b/components/gui/libraries/freetype/docs/CUSTOMIZE similarity index 100% rename from components/external/freetype/docs/CUSTOMIZE rename to components/gui/libraries/freetype/docs/CUSTOMIZE diff --git a/components/external/freetype/docs/FTL.TXT b/components/gui/libraries/freetype/docs/FTL.TXT similarity index 100% rename from components/external/freetype/docs/FTL.TXT rename to components/gui/libraries/freetype/docs/FTL.TXT diff --git a/components/external/freetype/docs/GPLv2.TXT b/components/gui/libraries/freetype/docs/GPLv2.TXT similarity index 100% rename from components/external/freetype/docs/GPLv2.TXT rename to components/gui/libraries/freetype/docs/GPLv2.TXT diff --git a/components/external/freetype/docs/INSTALL b/components/gui/libraries/freetype/docs/INSTALL similarity index 100% rename from components/external/freetype/docs/INSTALL rename to components/gui/libraries/freetype/docs/INSTALL diff --git a/components/external/freetype/docs/INSTALL.ANY b/components/gui/libraries/freetype/docs/INSTALL.ANY similarity index 100% rename from components/external/freetype/docs/INSTALL.ANY rename to components/gui/libraries/freetype/docs/INSTALL.ANY diff --git a/components/external/freetype/docs/INSTALL.CROSS b/components/gui/libraries/freetype/docs/INSTALL.CROSS similarity index 100% rename from components/external/freetype/docs/INSTALL.CROSS rename to components/gui/libraries/freetype/docs/INSTALL.CROSS diff --git a/components/external/freetype/docs/INSTALL.GNU b/components/gui/libraries/freetype/docs/INSTALL.GNU similarity index 100% rename from components/external/freetype/docs/INSTALL.GNU rename to components/gui/libraries/freetype/docs/INSTALL.GNU diff --git a/components/external/freetype/docs/INSTALL.MAC b/components/gui/libraries/freetype/docs/INSTALL.MAC similarity index 100% rename from components/external/freetype/docs/INSTALL.MAC rename to components/gui/libraries/freetype/docs/INSTALL.MAC diff --git a/components/external/freetype/docs/INSTALL.UNIX b/components/gui/libraries/freetype/docs/INSTALL.UNIX similarity index 100% rename from components/external/freetype/docs/INSTALL.UNIX rename to components/gui/libraries/freetype/docs/INSTALL.UNIX diff --git a/components/external/freetype/docs/INSTALL.VMS b/components/gui/libraries/freetype/docs/INSTALL.VMS similarity index 100% rename from components/external/freetype/docs/INSTALL.VMS rename to components/gui/libraries/freetype/docs/INSTALL.VMS diff --git a/components/external/freetype/docs/LICENSE.TXT b/components/gui/libraries/freetype/docs/LICENSE.TXT similarity index 100% rename from components/external/freetype/docs/LICENSE.TXT rename to components/gui/libraries/freetype/docs/LICENSE.TXT diff --git a/components/external/freetype/docs/MAKEPP b/components/gui/libraries/freetype/docs/MAKEPP similarity index 100% rename from components/external/freetype/docs/MAKEPP rename to components/gui/libraries/freetype/docs/MAKEPP diff --git a/components/external/freetype/docs/PROBLEMS b/components/gui/libraries/freetype/docs/PROBLEMS similarity index 100% rename from components/external/freetype/docs/PROBLEMS rename to components/gui/libraries/freetype/docs/PROBLEMS diff --git a/components/external/freetype/docs/TODO b/components/gui/libraries/freetype/docs/TODO similarity index 100% rename from components/external/freetype/docs/TODO rename to components/gui/libraries/freetype/docs/TODO diff --git a/components/external/freetype/docs/VERSION.DLL b/components/gui/libraries/freetype/docs/VERSION.DLL similarity index 100% rename from components/external/freetype/docs/VERSION.DLL rename to components/gui/libraries/freetype/docs/VERSION.DLL diff --git a/components/external/freetype/docs/formats.txt b/components/gui/libraries/freetype/docs/formats.txt similarity index 100% rename from components/external/freetype/docs/formats.txt rename to components/gui/libraries/freetype/docs/formats.txt diff --git a/components/external/freetype/docs/freetype-config.1 b/components/gui/libraries/freetype/docs/freetype-config.1 similarity index 100% rename from components/external/freetype/docs/freetype-config.1 rename to components/gui/libraries/freetype/docs/freetype-config.1 diff --git a/components/external/freetype/docs/raster.txt b/components/gui/libraries/freetype/docs/raster.txt similarity index 100% rename from components/external/freetype/docs/raster.txt rename to components/gui/libraries/freetype/docs/raster.txt diff --git a/components/external/freetype/docs/reference/.gitignore b/components/gui/libraries/freetype/docs/reference/.gitignore similarity index 100% rename from components/external/freetype/docs/reference/.gitignore rename to components/gui/libraries/freetype/docs/reference/.gitignore diff --git a/components/external/freetype/docs/reference/README b/components/gui/libraries/freetype/docs/reference/README similarity index 100% rename from components/external/freetype/docs/reference/README rename to components/gui/libraries/freetype/docs/reference/README diff --git a/components/external/freetype/docs/release b/components/gui/libraries/freetype/docs/release similarity index 100% rename from components/external/freetype/docs/release rename to components/gui/libraries/freetype/docs/release diff --git a/components/external/freetype/include/config/ftconfig.h b/components/gui/libraries/freetype/include/config/ftconfig.h similarity index 100% rename from components/external/freetype/include/config/ftconfig.h rename to components/gui/libraries/freetype/include/config/ftconfig.h diff --git a/components/external/freetype/include/config/ftheader.h b/components/gui/libraries/freetype/include/config/ftheader.h similarity index 100% rename from components/external/freetype/include/config/ftheader.h rename to components/gui/libraries/freetype/include/config/ftheader.h diff --git a/components/external/freetype/include/config/ftmodule.h b/components/gui/libraries/freetype/include/config/ftmodule.h similarity index 100% rename from components/external/freetype/include/config/ftmodule.h rename to components/gui/libraries/freetype/include/config/ftmodule.h diff --git a/components/external/freetype/include/config/ftoption.h b/components/gui/libraries/freetype/include/config/ftoption.h similarity index 100% rename from components/external/freetype/include/config/ftoption.h rename to components/gui/libraries/freetype/include/config/ftoption.h diff --git a/components/external/freetype/include/config/ftstdlib.h b/components/gui/libraries/freetype/include/config/ftstdlib.h similarity index 100% rename from components/external/freetype/include/config/ftstdlib.h rename to components/gui/libraries/freetype/include/config/ftstdlib.h diff --git a/components/external/freetype/include/freetype.h b/components/gui/libraries/freetype/include/freetype.h similarity index 100% rename from components/external/freetype/include/freetype.h rename to components/gui/libraries/freetype/include/freetype.h diff --git a/components/external/freetype/include/ft2build.h b/components/gui/libraries/freetype/include/ft2build.h similarity index 100% rename from components/external/freetype/include/ft2build.h rename to components/gui/libraries/freetype/include/ft2build.h diff --git a/components/external/freetype/include/ftadvanc.h b/components/gui/libraries/freetype/include/ftadvanc.h similarity index 100% rename from components/external/freetype/include/ftadvanc.h rename to components/gui/libraries/freetype/include/ftadvanc.h diff --git a/components/external/freetype/include/ftautoh.h b/components/gui/libraries/freetype/include/ftautoh.h similarity index 100% rename from components/external/freetype/include/ftautoh.h rename to components/gui/libraries/freetype/include/ftautoh.h diff --git a/components/external/freetype/include/ftbbox.h b/components/gui/libraries/freetype/include/ftbbox.h similarity index 100% rename from components/external/freetype/include/ftbbox.h rename to components/gui/libraries/freetype/include/ftbbox.h diff --git a/components/external/freetype/include/ftbdf.h b/components/gui/libraries/freetype/include/ftbdf.h similarity index 100% rename from components/external/freetype/include/ftbdf.h rename to components/gui/libraries/freetype/include/ftbdf.h diff --git a/components/external/freetype/include/ftbitmap.h b/components/gui/libraries/freetype/include/ftbitmap.h similarity index 100% rename from components/external/freetype/include/ftbitmap.h rename to components/gui/libraries/freetype/include/ftbitmap.h diff --git a/components/external/freetype/include/ftbzip2.h b/components/gui/libraries/freetype/include/ftbzip2.h similarity index 100% rename from components/external/freetype/include/ftbzip2.h rename to components/gui/libraries/freetype/include/ftbzip2.h diff --git a/components/external/freetype/include/ftcache.h b/components/gui/libraries/freetype/include/ftcache.h similarity index 100% rename from components/external/freetype/include/ftcache.h rename to components/gui/libraries/freetype/include/ftcache.h diff --git a/components/external/freetype/include/ftcffdrv.h b/components/gui/libraries/freetype/include/ftcffdrv.h similarity index 100% rename from components/external/freetype/include/ftcffdrv.h rename to components/gui/libraries/freetype/include/ftcffdrv.h diff --git a/components/external/freetype/include/ftchapters.h b/components/gui/libraries/freetype/include/ftchapters.h similarity index 100% rename from components/external/freetype/include/ftchapters.h rename to components/gui/libraries/freetype/include/ftchapters.h diff --git a/components/external/freetype/include/ftcid.h b/components/gui/libraries/freetype/include/ftcid.h similarity index 100% rename from components/external/freetype/include/ftcid.h rename to components/gui/libraries/freetype/include/ftcid.h diff --git a/components/external/freetype/include/fterrdef.h b/components/gui/libraries/freetype/include/fterrdef.h similarity index 100% rename from components/external/freetype/include/fterrdef.h rename to components/gui/libraries/freetype/include/fterrdef.h diff --git a/components/external/freetype/include/fterrors.h b/components/gui/libraries/freetype/include/fterrors.h similarity index 100% rename from components/external/freetype/include/fterrors.h rename to components/gui/libraries/freetype/include/fterrors.h diff --git a/components/external/freetype/include/ftgasp.h b/components/gui/libraries/freetype/include/ftgasp.h similarity index 100% rename from components/external/freetype/include/ftgasp.h rename to components/gui/libraries/freetype/include/ftgasp.h diff --git a/components/external/freetype/include/ftglyph.h b/components/gui/libraries/freetype/include/ftglyph.h similarity index 100% rename from components/external/freetype/include/ftglyph.h rename to components/gui/libraries/freetype/include/ftglyph.h diff --git a/components/external/freetype/include/ftgxval.h b/components/gui/libraries/freetype/include/ftgxval.h similarity index 100% rename from components/external/freetype/include/ftgxval.h rename to components/gui/libraries/freetype/include/ftgxval.h diff --git a/components/external/freetype/include/ftgzip.h b/components/gui/libraries/freetype/include/ftgzip.h similarity index 100% rename from components/external/freetype/include/ftgzip.h rename to components/gui/libraries/freetype/include/ftgzip.h diff --git a/components/external/freetype/include/ftimage.h b/components/gui/libraries/freetype/include/ftimage.h similarity index 100% rename from components/external/freetype/include/ftimage.h rename to components/gui/libraries/freetype/include/ftimage.h diff --git a/components/external/freetype/include/ftincrem.h b/components/gui/libraries/freetype/include/ftincrem.h similarity index 100% rename from components/external/freetype/include/ftincrem.h rename to components/gui/libraries/freetype/include/ftincrem.h diff --git a/components/external/freetype/include/ftlcdfil.h b/components/gui/libraries/freetype/include/ftlcdfil.h similarity index 100% rename from components/external/freetype/include/ftlcdfil.h rename to components/gui/libraries/freetype/include/ftlcdfil.h diff --git a/components/external/freetype/include/ftlist.h b/components/gui/libraries/freetype/include/ftlist.h similarity index 100% rename from components/external/freetype/include/ftlist.h rename to components/gui/libraries/freetype/include/ftlist.h diff --git a/components/external/freetype/include/ftlzw.h b/components/gui/libraries/freetype/include/ftlzw.h similarity index 100% rename from components/external/freetype/include/ftlzw.h rename to components/gui/libraries/freetype/include/ftlzw.h diff --git a/components/external/freetype/include/ftmac.h b/components/gui/libraries/freetype/include/ftmac.h similarity index 100% rename from components/external/freetype/include/ftmac.h rename to components/gui/libraries/freetype/include/ftmac.h diff --git a/components/external/freetype/include/ftmm.h b/components/gui/libraries/freetype/include/ftmm.h similarity index 100% rename from components/external/freetype/include/ftmm.h rename to components/gui/libraries/freetype/include/ftmm.h diff --git a/components/external/freetype/include/ftmodapi.h b/components/gui/libraries/freetype/include/ftmodapi.h similarity index 100% rename from components/external/freetype/include/ftmodapi.h rename to components/gui/libraries/freetype/include/ftmodapi.h diff --git a/components/external/freetype/include/ftmoderr.h b/components/gui/libraries/freetype/include/ftmoderr.h similarity index 100% rename from components/external/freetype/include/ftmoderr.h rename to components/gui/libraries/freetype/include/ftmoderr.h diff --git a/components/external/freetype/include/ftotval.h b/components/gui/libraries/freetype/include/ftotval.h similarity index 100% rename from components/external/freetype/include/ftotval.h rename to components/gui/libraries/freetype/include/ftotval.h diff --git a/components/external/freetype/include/ftoutln.h b/components/gui/libraries/freetype/include/ftoutln.h similarity index 100% rename from components/external/freetype/include/ftoutln.h rename to components/gui/libraries/freetype/include/ftoutln.h diff --git a/components/external/freetype/include/ftpfr.h b/components/gui/libraries/freetype/include/ftpfr.h similarity index 100% rename from components/external/freetype/include/ftpfr.h rename to components/gui/libraries/freetype/include/ftpfr.h diff --git a/components/external/freetype/include/ftrender.h b/components/gui/libraries/freetype/include/ftrender.h similarity index 100% rename from components/external/freetype/include/ftrender.h rename to components/gui/libraries/freetype/include/ftrender.h diff --git a/components/external/freetype/include/ftsizes.h b/components/gui/libraries/freetype/include/ftsizes.h similarity index 100% rename from components/external/freetype/include/ftsizes.h rename to components/gui/libraries/freetype/include/ftsizes.h diff --git a/components/external/freetype/include/ftsnames.h b/components/gui/libraries/freetype/include/ftsnames.h similarity index 100% rename from components/external/freetype/include/ftsnames.h rename to components/gui/libraries/freetype/include/ftsnames.h diff --git a/components/external/freetype/include/ftstroke.h b/components/gui/libraries/freetype/include/ftstroke.h similarity index 100% rename from components/external/freetype/include/ftstroke.h rename to components/gui/libraries/freetype/include/ftstroke.h diff --git a/components/external/freetype/include/ftsynth.h b/components/gui/libraries/freetype/include/ftsynth.h similarity index 100% rename from components/external/freetype/include/ftsynth.h rename to components/gui/libraries/freetype/include/ftsynth.h diff --git a/components/external/freetype/include/ftsystem.h b/components/gui/libraries/freetype/include/ftsystem.h similarity index 100% rename from components/external/freetype/include/ftsystem.h rename to components/gui/libraries/freetype/include/ftsystem.h diff --git a/components/external/freetype/include/fttrigon.h b/components/gui/libraries/freetype/include/fttrigon.h similarity index 100% rename from components/external/freetype/include/fttrigon.h rename to components/gui/libraries/freetype/include/fttrigon.h diff --git a/components/external/freetype/include/ftttdrv.h b/components/gui/libraries/freetype/include/ftttdrv.h similarity index 100% rename from components/external/freetype/include/ftttdrv.h rename to components/gui/libraries/freetype/include/ftttdrv.h diff --git a/components/external/freetype/include/fttypes.h b/components/gui/libraries/freetype/include/fttypes.h similarity index 100% rename from components/external/freetype/include/fttypes.h rename to components/gui/libraries/freetype/include/fttypes.h diff --git a/components/external/freetype/include/ftwinfnt.h b/components/gui/libraries/freetype/include/ftwinfnt.h similarity index 100% rename from components/external/freetype/include/ftwinfnt.h rename to components/gui/libraries/freetype/include/ftwinfnt.h diff --git a/components/external/freetype/include/ftxf86.h b/components/gui/libraries/freetype/include/ftxf86.h similarity index 100% rename from components/external/freetype/include/ftxf86.h rename to components/gui/libraries/freetype/include/ftxf86.h diff --git a/components/external/freetype/include/internal/autohint.h b/components/gui/libraries/freetype/include/internal/autohint.h similarity index 100% rename from components/external/freetype/include/internal/autohint.h rename to components/gui/libraries/freetype/include/internal/autohint.h diff --git a/components/external/freetype/include/internal/ftcalc.h b/components/gui/libraries/freetype/include/internal/ftcalc.h similarity index 100% rename from components/external/freetype/include/internal/ftcalc.h rename to components/gui/libraries/freetype/include/internal/ftcalc.h diff --git a/components/external/freetype/include/internal/ftdebug.h b/components/gui/libraries/freetype/include/internal/ftdebug.h similarity index 100% rename from components/external/freetype/include/internal/ftdebug.h rename to components/gui/libraries/freetype/include/internal/ftdebug.h diff --git a/components/external/freetype/include/internal/ftdriver.h b/components/gui/libraries/freetype/include/internal/ftdriver.h similarity index 100% rename from components/external/freetype/include/internal/ftdriver.h rename to components/gui/libraries/freetype/include/internal/ftdriver.h diff --git a/components/external/freetype/include/internal/ftgloadr.h b/components/gui/libraries/freetype/include/internal/ftgloadr.h similarity index 100% rename from components/external/freetype/include/internal/ftgloadr.h rename to components/gui/libraries/freetype/include/internal/ftgloadr.h diff --git a/components/external/freetype/include/internal/ftmemory.h b/components/gui/libraries/freetype/include/internal/ftmemory.h similarity index 100% rename from components/external/freetype/include/internal/ftmemory.h rename to components/gui/libraries/freetype/include/internal/ftmemory.h diff --git a/components/external/freetype/include/internal/ftobjs.h b/components/gui/libraries/freetype/include/internal/ftobjs.h similarity index 100% rename from components/external/freetype/include/internal/ftobjs.h rename to components/gui/libraries/freetype/include/internal/ftobjs.h diff --git a/components/external/freetype/include/internal/ftpic.h b/components/gui/libraries/freetype/include/internal/ftpic.h similarity index 100% rename from components/external/freetype/include/internal/ftpic.h rename to components/gui/libraries/freetype/include/internal/ftpic.h diff --git a/components/external/freetype/include/internal/ftrfork.h b/components/gui/libraries/freetype/include/internal/ftrfork.h similarity index 100% rename from components/external/freetype/include/internal/ftrfork.h rename to components/gui/libraries/freetype/include/internal/ftrfork.h diff --git a/components/external/freetype/include/internal/ftserv.h b/components/gui/libraries/freetype/include/internal/ftserv.h similarity index 100% rename from components/external/freetype/include/internal/ftserv.h rename to components/gui/libraries/freetype/include/internal/ftserv.h diff --git a/components/external/freetype/include/internal/ftstream.h b/components/gui/libraries/freetype/include/internal/ftstream.h similarity index 100% rename from components/external/freetype/include/internal/ftstream.h rename to components/gui/libraries/freetype/include/internal/ftstream.h diff --git a/components/external/freetype/include/internal/fttrace.h b/components/gui/libraries/freetype/include/internal/fttrace.h similarity index 100% rename from components/external/freetype/include/internal/fttrace.h rename to components/gui/libraries/freetype/include/internal/fttrace.h diff --git a/components/external/freetype/include/internal/ftvalid.h b/components/gui/libraries/freetype/include/internal/ftvalid.h similarity index 100% rename from components/external/freetype/include/internal/ftvalid.h rename to components/gui/libraries/freetype/include/internal/ftvalid.h diff --git a/components/external/freetype/include/internal/internal.h b/components/gui/libraries/freetype/include/internal/internal.h similarity index 100% rename from components/external/freetype/include/internal/internal.h rename to components/gui/libraries/freetype/include/internal/internal.h diff --git a/components/external/freetype/include/internal/psaux.h b/components/gui/libraries/freetype/include/internal/psaux.h similarity index 100% rename from components/external/freetype/include/internal/psaux.h rename to components/gui/libraries/freetype/include/internal/psaux.h diff --git a/components/external/freetype/include/internal/pshints.h b/components/gui/libraries/freetype/include/internal/pshints.h similarity index 100% rename from components/external/freetype/include/internal/pshints.h rename to components/gui/libraries/freetype/include/internal/pshints.h diff --git a/components/external/freetype/include/internal/services/svbdf.h b/components/gui/libraries/freetype/include/internal/services/svbdf.h similarity index 100% rename from components/external/freetype/include/internal/services/svbdf.h rename to components/gui/libraries/freetype/include/internal/services/svbdf.h diff --git a/components/external/freetype/include/internal/services/svcid.h b/components/gui/libraries/freetype/include/internal/services/svcid.h similarity index 100% rename from components/external/freetype/include/internal/services/svcid.h rename to components/gui/libraries/freetype/include/internal/services/svcid.h diff --git a/components/external/freetype/include/internal/services/svgldict.h b/components/gui/libraries/freetype/include/internal/services/svgldict.h similarity index 100% rename from components/external/freetype/include/internal/services/svgldict.h rename to components/gui/libraries/freetype/include/internal/services/svgldict.h diff --git a/components/external/freetype/include/internal/services/svgxval.h b/components/gui/libraries/freetype/include/internal/services/svgxval.h similarity index 100% rename from components/external/freetype/include/internal/services/svgxval.h rename to components/gui/libraries/freetype/include/internal/services/svgxval.h diff --git a/components/external/freetype/include/internal/services/svkern.h b/components/gui/libraries/freetype/include/internal/services/svkern.h similarity index 100% rename from components/external/freetype/include/internal/services/svkern.h rename to components/gui/libraries/freetype/include/internal/services/svkern.h diff --git a/components/external/freetype/include/internal/services/svmm.h b/components/gui/libraries/freetype/include/internal/services/svmm.h similarity index 100% rename from components/external/freetype/include/internal/services/svmm.h rename to components/gui/libraries/freetype/include/internal/services/svmm.h diff --git a/components/external/freetype/include/internal/services/svotval.h b/components/gui/libraries/freetype/include/internal/services/svotval.h similarity index 100% rename from components/external/freetype/include/internal/services/svotval.h rename to components/gui/libraries/freetype/include/internal/services/svotval.h diff --git a/components/external/freetype/include/internal/services/svpfr.h b/components/gui/libraries/freetype/include/internal/services/svpfr.h similarity index 100% rename from components/external/freetype/include/internal/services/svpfr.h rename to components/gui/libraries/freetype/include/internal/services/svpfr.h diff --git a/components/external/freetype/include/internal/services/svpostnm.h b/components/gui/libraries/freetype/include/internal/services/svpostnm.h similarity index 100% rename from components/external/freetype/include/internal/services/svpostnm.h rename to components/gui/libraries/freetype/include/internal/services/svpostnm.h diff --git a/components/external/freetype/include/internal/services/svprop.h b/components/gui/libraries/freetype/include/internal/services/svprop.h similarity index 100% rename from components/external/freetype/include/internal/services/svprop.h rename to components/gui/libraries/freetype/include/internal/services/svprop.h diff --git a/components/external/freetype/include/internal/services/svpscmap.h b/components/gui/libraries/freetype/include/internal/services/svpscmap.h similarity index 100% rename from components/external/freetype/include/internal/services/svpscmap.h rename to components/gui/libraries/freetype/include/internal/services/svpscmap.h diff --git a/components/external/freetype/include/internal/services/svpsinfo.h b/components/gui/libraries/freetype/include/internal/services/svpsinfo.h similarity index 100% rename from components/external/freetype/include/internal/services/svpsinfo.h rename to components/gui/libraries/freetype/include/internal/services/svpsinfo.h diff --git a/components/external/freetype/include/internal/services/svsfnt.h b/components/gui/libraries/freetype/include/internal/services/svsfnt.h similarity index 100% rename from components/external/freetype/include/internal/services/svsfnt.h rename to components/gui/libraries/freetype/include/internal/services/svsfnt.h diff --git a/components/external/freetype/include/internal/services/svttcmap.h b/components/gui/libraries/freetype/include/internal/services/svttcmap.h similarity index 100% rename from components/external/freetype/include/internal/services/svttcmap.h rename to components/gui/libraries/freetype/include/internal/services/svttcmap.h diff --git a/components/external/freetype/include/internal/services/svtteng.h b/components/gui/libraries/freetype/include/internal/services/svtteng.h similarity index 100% rename from components/external/freetype/include/internal/services/svtteng.h rename to components/gui/libraries/freetype/include/internal/services/svtteng.h diff --git a/components/external/freetype/include/internal/services/svttglyf.h b/components/gui/libraries/freetype/include/internal/services/svttglyf.h similarity index 100% rename from components/external/freetype/include/internal/services/svttglyf.h rename to components/gui/libraries/freetype/include/internal/services/svttglyf.h diff --git a/components/external/freetype/include/internal/services/svwinfnt.h b/components/gui/libraries/freetype/include/internal/services/svwinfnt.h similarity index 100% rename from components/external/freetype/include/internal/services/svwinfnt.h rename to components/gui/libraries/freetype/include/internal/services/svwinfnt.h diff --git a/components/external/freetype/include/internal/services/svxf86nm.h b/components/gui/libraries/freetype/include/internal/services/svxf86nm.h similarity index 100% rename from components/external/freetype/include/internal/services/svxf86nm.h rename to components/gui/libraries/freetype/include/internal/services/svxf86nm.h diff --git a/components/external/freetype/include/internal/sfnt.h b/components/gui/libraries/freetype/include/internal/sfnt.h similarity index 100% rename from components/external/freetype/include/internal/sfnt.h rename to components/gui/libraries/freetype/include/internal/sfnt.h diff --git a/components/external/freetype/include/internal/t1types.h b/components/gui/libraries/freetype/include/internal/t1types.h similarity index 100% rename from components/external/freetype/include/internal/t1types.h rename to components/gui/libraries/freetype/include/internal/t1types.h diff --git a/components/external/freetype/include/internal/tttypes.h b/components/gui/libraries/freetype/include/internal/tttypes.h similarity index 100% rename from components/external/freetype/include/internal/tttypes.h rename to components/gui/libraries/freetype/include/internal/tttypes.h diff --git a/components/external/freetype/include/t1tables.h b/components/gui/libraries/freetype/include/t1tables.h similarity index 100% rename from components/external/freetype/include/t1tables.h rename to components/gui/libraries/freetype/include/t1tables.h diff --git a/components/external/freetype/include/ttnameid.h b/components/gui/libraries/freetype/include/ttnameid.h similarity index 100% rename from components/external/freetype/include/ttnameid.h rename to components/gui/libraries/freetype/include/ttnameid.h diff --git a/components/external/freetype/include/tttables.h b/components/gui/libraries/freetype/include/tttables.h similarity index 100% rename from components/external/freetype/include/tttables.h rename to components/gui/libraries/freetype/include/tttables.h diff --git a/components/external/freetype/include/tttags.h b/components/gui/libraries/freetype/include/tttags.h similarity index 100% rename from components/external/freetype/include/tttags.h rename to components/gui/libraries/freetype/include/tttags.h diff --git a/components/external/freetype/include/ttunpat.h b/components/gui/libraries/freetype/include/ttunpat.h similarity index 100% rename from components/external/freetype/include/ttunpat.h rename to components/gui/libraries/freetype/include/ttunpat.h diff --git a/components/external/freetype/modules.cfg b/components/gui/libraries/freetype/modules.cfg similarity index 100% rename from components/external/freetype/modules.cfg rename to components/gui/libraries/freetype/modules.cfg diff --git a/components/external/freetype/objs/.gitignore b/components/gui/libraries/freetype/objs/.gitignore similarity index 100% rename from components/external/freetype/objs/.gitignore rename to components/gui/libraries/freetype/objs/.gitignore diff --git a/components/external/freetype/objs/README b/components/gui/libraries/freetype/objs/README similarity index 100% rename from components/external/freetype/objs/README rename to components/gui/libraries/freetype/objs/README diff --git a/components/external/freetype/src/Jamfile b/components/gui/libraries/freetype/src/Jamfile similarity index 100% rename from components/external/freetype/src/Jamfile rename to components/gui/libraries/freetype/src/Jamfile diff --git a/components/external/freetype/src/autofit/Jamfile b/components/gui/libraries/freetype/src/autofit/Jamfile similarity index 100% rename from components/external/freetype/src/autofit/Jamfile rename to components/gui/libraries/freetype/src/autofit/Jamfile diff --git a/components/external/freetype/src/autofit/afangles.c b/components/gui/libraries/freetype/src/autofit/afangles.c similarity index 100% rename from components/external/freetype/src/autofit/afangles.c rename to components/gui/libraries/freetype/src/autofit/afangles.c diff --git a/components/external/freetype/src/autofit/afangles.h b/components/gui/libraries/freetype/src/autofit/afangles.h similarity index 100% rename from components/external/freetype/src/autofit/afangles.h rename to components/gui/libraries/freetype/src/autofit/afangles.h diff --git a/components/external/freetype/src/autofit/afblue.c b/components/gui/libraries/freetype/src/autofit/afblue.c similarity index 100% rename from components/external/freetype/src/autofit/afblue.c rename to components/gui/libraries/freetype/src/autofit/afblue.c diff --git a/components/external/freetype/src/autofit/afblue.cin b/components/gui/libraries/freetype/src/autofit/afblue.cin similarity index 100% rename from components/external/freetype/src/autofit/afblue.cin rename to components/gui/libraries/freetype/src/autofit/afblue.cin diff --git a/components/external/freetype/src/autofit/afblue.dat b/components/gui/libraries/freetype/src/autofit/afblue.dat similarity index 100% rename from components/external/freetype/src/autofit/afblue.dat rename to components/gui/libraries/freetype/src/autofit/afblue.dat diff --git a/components/external/freetype/src/autofit/afblue.h b/components/gui/libraries/freetype/src/autofit/afblue.h similarity index 100% rename from components/external/freetype/src/autofit/afblue.h rename to components/gui/libraries/freetype/src/autofit/afblue.h diff --git a/components/external/freetype/src/autofit/afblue.hin b/components/gui/libraries/freetype/src/autofit/afblue.hin similarity index 100% rename from components/external/freetype/src/autofit/afblue.hin rename to components/gui/libraries/freetype/src/autofit/afblue.hin diff --git a/components/external/freetype/src/autofit/afcjk.c b/components/gui/libraries/freetype/src/autofit/afcjk.c similarity index 100% rename from components/external/freetype/src/autofit/afcjk.c rename to components/gui/libraries/freetype/src/autofit/afcjk.c diff --git a/components/external/freetype/src/autofit/afcjk.h b/components/gui/libraries/freetype/src/autofit/afcjk.h similarity index 100% rename from components/external/freetype/src/autofit/afcjk.h rename to components/gui/libraries/freetype/src/autofit/afcjk.h diff --git a/components/external/freetype/src/autofit/afcover.h b/components/gui/libraries/freetype/src/autofit/afcover.h similarity index 100% rename from components/external/freetype/src/autofit/afcover.h rename to components/gui/libraries/freetype/src/autofit/afcover.h diff --git a/components/external/freetype/src/autofit/afdummy.c b/components/gui/libraries/freetype/src/autofit/afdummy.c similarity index 100% rename from components/external/freetype/src/autofit/afdummy.c rename to components/gui/libraries/freetype/src/autofit/afdummy.c diff --git a/components/external/freetype/src/autofit/afdummy.h b/components/gui/libraries/freetype/src/autofit/afdummy.h similarity index 100% rename from components/external/freetype/src/autofit/afdummy.h rename to components/gui/libraries/freetype/src/autofit/afdummy.h diff --git a/components/external/freetype/src/autofit/aferrors.h b/components/gui/libraries/freetype/src/autofit/aferrors.h similarity index 100% rename from components/external/freetype/src/autofit/aferrors.h rename to components/gui/libraries/freetype/src/autofit/aferrors.h diff --git a/components/external/freetype/src/autofit/afglobal.c b/components/gui/libraries/freetype/src/autofit/afglobal.c similarity index 100% rename from components/external/freetype/src/autofit/afglobal.c rename to components/gui/libraries/freetype/src/autofit/afglobal.c diff --git a/components/external/freetype/src/autofit/afglobal.h b/components/gui/libraries/freetype/src/autofit/afglobal.h similarity index 100% rename from components/external/freetype/src/autofit/afglobal.h rename to components/gui/libraries/freetype/src/autofit/afglobal.h diff --git a/components/external/freetype/src/autofit/afhints.c b/components/gui/libraries/freetype/src/autofit/afhints.c similarity index 100% rename from components/external/freetype/src/autofit/afhints.c rename to components/gui/libraries/freetype/src/autofit/afhints.c diff --git a/components/external/freetype/src/autofit/afhints.h b/components/gui/libraries/freetype/src/autofit/afhints.h similarity index 100% rename from components/external/freetype/src/autofit/afhints.h rename to components/gui/libraries/freetype/src/autofit/afhints.h diff --git a/components/external/freetype/src/autofit/afindic.c b/components/gui/libraries/freetype/src/autofit/afindic.c similarity index 100% rename from components/external/freetype/src/autofit/afindic.c rename to components/gui/libraries/freetype/src/autofit/afindic.c diff --git a/components/external/freetype/src/autofit/afindic.h b/components/gui/libraries/freetype/src/autofit/afindic.h similarity index 100% rename from components/external/freetype/src/autofit/afindic.h rename to components/gui/libraries/freetype/src/autofit/afindic.h diff --git a/components/external/freetype/src/autofit/aflatin.c b/components/gui/libraries/freetype/src/autofit/aflatin.c similarity index 100% rename from components/external/freetype/src/autofit/aflatin.c rename to components/gui/libraries/freetype/src/autofit/aflatin.c diff --git a/components/external/freetype/src/autofit/aflatin.h b/components/gui/libraries/freetype/src/autofit/aflatin.h similarity index 100% rename from components/external/freetype/src/autofit/aflatin.h rename to components/gui/libraries/freetype/src/autofit/aflatin.h diff --git a/components/external/freetype/src/autofit/aflatin2.c b/components/gui/libraries/freetype/src/autofit/aflatin2.c similarity index 100% rename from components/external/freetype/src/autofit/aflatin2.c rename to components/gui/libraries/freetype/src/autofit/aflatin2.c diff --git a/components/external/freetype/src/autofit/aflatin2.h b/components/gui/libraries/freetype/src/autofit/aflatin2.h similarity index 100% rename from components/external/freetype/src/autofit/aflatin2.h rename to components/gui/libraries/freetype/src/autofit/aflatin2.h diff --git a/components/external/freetype/src/autofit/afloader.c b/components/gui/libraries/freetype/src/autofit/afloader.c similarity index 100% rename from components/external/freetype/src/autofit/afloader.c rename to components/gui/libraries/freetype/src/autofit/afloader.c diff --git a/components/external/freetype/src/autofit/afloader.h b/components/gui/libraries/freetype/src/autofit/afloader.h similarity index 100% rename from components/external/freetype/src/autofit/afloader.h rename to components/gui/libraries/freetype/src/autofit/afloader.h diff --git a/components/external/freetype/src/autofit/afmodule.c b/components/gui/libraries/freetype/src/autofit/afmodule.c similarity index 100% rename from components/external/freetype/src/autofit/afmodule.c rename to components/gui/libraries/freetype/src/autofit/afmodule.c diff --git a/components/external/freetype/src/autofit/afmodule.h b/components/gui/libraries/freetype/src/autofit/afmodule.h similarity index 100% rename from components/external/freetype/src/autofit/afmodule.h rename to components/gui/libraries/freetype/src/autofit/afmodule.h diff --git a/components/external/freetype/src/autofit/afpic.c b/components/gui/libraries/freetype/src/autofit/afpic.c similarity index 100% rename from components/external/freetype/src/autofit/afpic.c rename to components/gui/libraries/freetype/src/autofit/afpic.c diff --git a/components/external/freetype/src/autofit/afpic.h b/components/gui/libraries/freetype/src/autofit/afpic.h similarity index 100% rename from components/external/freetype/src/autofit/afpic.h rename to components/gui/libraries/freetype/src/autofit/afpic.h diff --git a/components/external/freetype/src/autofit/afranges.c b/components/gui/libraries/freetype/src/autofit/afranges.c similarity index 100% rename from components/external/freetype/src/autofit/afranges.c rename to components/gui/libraries/freetype/src/autofit/afranges.c diff --git a/components/external/freetype/src/autofit/afranges.h b/components/gui/libraries/freetype/src/autofit/afranges.h similarity index 100% rename from components/external/freetype/src/autofit/afranges.h rename to components/gui/libraries/freetype/src/autofit/afranges.h diff --git a/components/external/freetype/src/autofit/afscript.h b/components/gui/libraries/freetype/src/autofit/afscript.h similarity index 100% rename from components/external/freetype/src/autofit/afscript.h rename to components/gui/libraries/freetype/src/autofit/afscript.h diff --git a/components/external/freetype/src/autofit/afstyles.h b/components/gui/libraries/freetype/src/autofit/afstyles.h similarity index 100% rename from components/external/freetype/src/autofit/afstyles.h rename to components/gui/libraries/freetype/src/autofit/afstyles.h diff --git a/components/external/freetype/src/autofit/aftypes.h b/components/gui/libraries/freetype/src/autofit/aftypes.h similarity index 100% rename from components/external/freetype/src/autofit/aftypes.h rename to components/gui/libraries/freetype/src/autofit/aftypes.h diff --git a/components/external/freetype/src/autofit/afwarp.c b/components/gui/libraries/freetype/src/autofit/afwarp.c similarity index 100% rename from components/external/freetype/src/autofit/afwarp.c rename to components/gui/libraries/freetype/src/autofit/afwarp.c diff --git a/components/external/freetype/src/autofit/afwarp.h b/components/gui/libraries/freetype/src/autofit/afwarp.h similarity index 100% rename from components/external/freetype/src/autofit/afwarp.h rename to components/gui/libraries/freetype/src/autofit/afwarp.h diff --git a/components/external/freetype/src/autofit/afwrtsys.h b/components/gui/libraries/freetype/src/autofit/afwrtsys.h similarity index 100% rename from components/external/freetype/src/autofit/afwrtsys.h rename to components/gui/libraries/freetype/src/autofit/afwrtsys.h diff --git a/components/external/freetype/src/autofit/autofit.c b/components/gui/libraries/freetype/src/autofit/autofit.c similarity index 100% rename from components/external/freetype/src/autofit/autofit.c rename to components/gui/libraries/freetype/src/autofit/autofit.c diff --git a/components/external/freetype/src/autofit/hbshim.c b/components/gui/libraries/freetype/src/autofit/hbshim.c similarity index 100% rename from components/external/freetype/src/autofit/hbshim.c rename to components/gui/libraries/freetype/src/autofit/hbshim.c diff --git a/components/external/freetype/src/autofit/hbshim.h b/components/gui/libraries/freetype/src/autofit/hbshim.h similarity index 100% rename from components/external/freetype/src/autofit/hbshim.h rename to components/gui/libraries/freetype/src/autofit/hbshim.h diff --git a/components/external/freetype/src/autofit/module.mk b/components/gui/libraries/freetype/src/autofit/module.mk similarity index 100% rename from components/external/freetype/src/autofit/module.mk rename to components/gui/libraries/freetype/src/autofit/module.mk diff --git a/components/external/freetype/src/autofit/rules.mk b/components/gui/libraries/freetype/src/autofit/rules.mk similarity index 100% rename from components/external/freetype/src/autofit/rules.mk rename to components/gui/libraries/freetype/src/autofit/rules.mk diff --git a/components/external/freetype/src/base/Jamfile b/components/gui/libraries/freetype/src/base/Jamfile similarity index 100% rename from components/external/freetype/src/base/Jamfile rename to components/gui/libraries/freetype/src/base/Jamfile diff --git a/components/external/freetype/src/base/basepic.c b/components/gui/libraries/freetype/src/base/basepic.c similarity index 100% rename from components/external/freetype/src/base/basepic.c rename to components/gui/libraries/freetype/src/base/basepic.c diff --git a/components/external/freetype/src/base/basepic.h b/components/gui/libraries/freetype/src/base/basepic.h similarity index 100% rename from components/external/freetype/src/base/basepic.h rename to components/gui/libraries/freetype/src/base/basepic.h diff --git a/components/external/freetype/src/base/ftadvanc.c b/components/gui/libraries/freetype/src/base/ftadvanc.c similarity index 100% rename from components/external/freetype/src/base/ftadvanc.c rename to components/gui/libraries/freetype/src/base/ftadvanc.c diff --git a/components/external/freetype/src/base/ftapi.c b/components/gui/libraries/freetype/src/base/ftapi.c similarity index 100% rename from components/external/freetype/src/base/ftapi.c rename to components/gui/libraries/freetype/src/base/ftapi.c diff --git a/components/external/freetype/src/base/ftbase.c b/components/gui/libraries/freetype/src/base/ftbase.c similarity index 100% rename from components/external/freetype/src/base/ftbase.c rename to components/gui/libraries/freetype/src/base/ftbase.c diff --git a/components/external/freetype/src/base/ftbase.h b/components/gui/libraries/freetype/src/base/ftbase.h similarity index 100% rename from components/external/freetype/src/base/ftbase.h rename to components/gui/libraries/freetype/src/base/ftbase.h diff --git a/components/external/freetype/src/base/ftbbox.c b/components/gui/libraries/freetype/src/base/ftbbox.c similarity index 100% rename from components/external/freetype/src/base/ftbbox.c rename to components/gui/libraries/freetype/src/base/ftbbox.c diff --git a/components/external/freetype/src/base/ftbdf.c b/components/gui/libraries/freetype/src/base/ftbdf.c similarity index 100% rename from components/external/freetype/src/base/ftbdf.c rename to components/gui/libraries/freetype/src/base/ftbdf.c diff --git a/components/external/freetype/src/base/ftbitmap.c b/components/gui/libraries/freetype/src/base/ftbitmap.c similarity index 100% rename from components/external/freetype/src/base/ftbitmap.c rename to components/gui/libraries/freetype/src/base/ftbitmap.c diff --git a/components/external/freetype/src/base/ftcalc.c b/components/gui/libraries/freetype/src/base/ftcalc.c similarity index 100% rename from components/external/freetype/src/base/ftcalc.c rename to components/gui/libraries/freetype/src/base/ftcalc.c diff --git a/components/external/freetype/src/base/ftcid.c b/components/gui/libraries/freetype/src/base/ftcid.c similarity index 100% rename from components/external/freetype/src/base/ftcid.c rename to components/gui/libraries/freetype/src/base/ftcid.c diff --git a/components/external/freetype/src/base/ftdbgmem.c b/components/gui/libraries/freetype/src/base/ftdbgmem.c similarity index 100% rename from components/external/freetype/src/base/ftdbgmem.c rename to components/gui/libraries/freetype/src/base/ftdbgmem.c diff --git a/components/external/freetype/src/base/ftdebug.c b/components/gui/libraries/freetype/src/base/ftdebug.c similarity index 100% rename from components/external/freetype/src/base/ftdebug.c rename to components/gui/libraries/freetype/src/base/ftdebug.c diff --git a/components/external/freetype/src/base/ftfstype.c b/components/gui/libraries/freetype/src/base/ftfstype.c similarity index 100% rename from components/external/freetype/src/base/ftfstype.c rename to components/gui/libraries/freetype/src/base/ftfstype.c diff --git a/components/external/freetype/src/base/ftgasp.c b/components/gui/libraries/freetype/src/base/ftgasp.c similarity index 100% rename from components/external/freetype/src/base/ftgasp.c rename to components/gui/libraries/freetype/src/base/ftgasp.c diff --git a/components/external/freetype/src/base/ftgloadr.c b/components/gui/libraries/freetype/src/base/ftgloadr.c similarity index 100% rename from components/external/freetype/src/base/ftgloadr.c rename to components/gui/libraries/freetype/src/base/ftgloadr.c diff --git a/components/external/freetype/src/base/ftglyph.c b/components/gui/libraries/freetype/src/base/ftglyph.c similarity index 100% rename from components/external/freetype/src/base/ftglyph.c rename to components/gui/libraries/freetype/src/base/ftglyph.c diff --git a/components/external/freetype/src/base/ftgxval.c b/components/gui/libraries/freetype/src/base/ftgxval.c similarity index 100% rename from components/external/freetype/src/base/ftgxval.c rename to components/gui/libraries/freetype/src/base/ftgxval.c diff --git a/components/external/freetype/src/base/ftinit.c b/components/gui/libraries/freetype/src/base/ftinit.c similarity index 100% rename from components/external/freetype/src/base/ftinit.c rename to components/gui/libraries/freetype/src/base/ftinit.c diff --git a/components/external/freetype/src/base/ftlcdfil.c b/components/gui/libraries/freetype/src/base/ftlcdfil.c similarity index 100% rename from components/external/freetype/src/base/ftlcdfil.c rename to components/gui/libraries/freetype/src/base/ftlcdfil.c diff --git a/components/external/freetype/src/base/ftmac.c b/components/gui/libraries/freetype/src/base/ftmac.c similarity index 100% rename from components/external/freetype/src/base/ftmac.c rename to components/gui/libraries/freetype/src/base/ftmac.c diff --git a/components/external/freetype/src/base/ftmm.c b/components/gui/libraries/freetype/src/base/ftmm.c similarity index 100% rename from components/external/freetype/src/base/ftmm.c rename to components/gui/libraries/freetype/src/base/ftmm.c diff --git a/components/external/freetype/src/base/ftobjs.c b/components/gui/libraries/freetype/src/base/ftobjs.c similarity index 100% rename from components/external/freetype/src/base/ftobjs.c rename to components/gui/libraries/freetype/src/base/ftobjs.c diff --git a/components/external/freetype/src/base/ftotval.c b/components/gui/libraries/freetype/src/base/ftotval.c similarity index 100% rename from components/external/freetype/src/base/ftotval.c rename to components/gui/libraries/freetype/src/base/ftotval.c diff --git a/components/external/freetype/src/base/ftoutln.c b/components/gui/libraries/freetype/src/base/ftoutln.c similarity index 100% rename from components/external/freetype/src/base/ftoutln.c rename to components/gui/libraries/freetype/src/base/ftoutln.c diff --git a/components/external/freetype/src/base/ftpatent.c b/components/gui/libraries/freetype/src/base/ftpatent.c similarity index 100% rename from components/external/freetype/src/base/ftpatent.c rename to components/gui/libraries/freetype/src/base/ftpatent.c diff --git a/components/external/freetype/src/base/ftpfr.c b/components/gui/libraries/freetype/src/base/ftpfr.c similarity index 100% rename from components/external/freetype/src/base/ftpfr.c rename to components/gui/libraries/freetype/src/base/ftpfr.c diff --git a/components/external/freetype/src/base/ftpic.c b/components/gui/libraries/freetype/src/base/ftpic.c similarity index 100% rename from components/external/freetype/src/base/ftpic.c rename to components/gui/libraries/freetype/src/base/ftpic.c diff --git a/components/external/freetype/src/base/ftrfork.c b/components/gui/libraries/freetype/src/base/ftrfork.c similarity index 100% rename from components/external/freetype/src/base/ftrfork.c rename to components/gui/libraries/freetype/src/base/ftrfork.c diff --git a/components/external/freetype/src/base/ftsnames.c b/components/gui/libraries/freetype/src/base/ftsnames.c similarity index 100% rename from components/external/freetype/src/base/ftsnames.c rename to components/gui/libraries/freetype/src/base/ftsnames.c diff --git a/components/external/freetype/src/base/ftstream.c b/components/gui/libraries/freetype/src/base/ftstream.c similarity index 100% rename from components/external/freetype/src/base/ftstream.c rename to components/gui/libraries/freetype/src/base/ftstream.c diff --git a/components/external/freetype/src/base/ftstroke.c b/components/gui/libraries/freetype/src/base/ftstroke.c similarity index 100% rename from components/external/freetype/src/base/ftstroke.c rename to components/gui/libraries/freetype/src/base/ftstroke.c diff --git a/components/external/freetype/src/base/ftsynth.c b/components/gui/libraries/freetype/src/base/ftsynth.c similarity index 100% rename from components/external/freetype/src/base/ftsynth.c rename to components/gui/libraries/freetype/src/base/ftsynth.c diff --git a/components/external/freetype/src/base/ftsystem.c b/components/gui/libraries/freetype/src/base/ftsystem.c similarity index 100% rename from components/external/freetype/src/base/ftsystem.c rename to components/gui/libraries/freetype/src/base/ftsystem.c diff --git a/components/external/freetype/src/base/fttrigon.c b/components/gui/libraries/freetype/src/base/fttrigon.c similarity index 100% rename from components/external/freetype/src/base/fttrigon.c rename to components/gui/libraries/freetype/src/base/fttrigon.c diff --git a/components/external/freetype/src/base/fttype1.c b/components/gui/libraries/freetype/src/base/fttype1.c similarity index 100% rename from components/external/freetype/src/base/fttype1.c rename to components/gui/libraries/freetype/src/base/fttype1.c diff --git a/components/external/freetype/src/base/ftutil.c b/components/gui/libraries/freetype/src/base/ftutil.c similarity index 100% rename from components/external/freetype/src/base/ftutil.c rename to components/gui/libraries/freetype/src/base/ftutil.c diff --git a/components/external/freetype/src/base/ftwinfnt.c b/components/gui/libraries/freetype/src/base/ftwinfnt.c similarity index 100% rename from components/external/freetype/src/base/ftwinfnt.c rename to components/gui/libraries/freetype/src/base/ftwinfnt.c diff --git a/components/external/freetype/src/base/ftxf86.c b/components/gui/libraries/freetype/src/base/ftxf86.c similarity index 100% rename from components/external/freetype/src/base/ftxf86.c rename to components/gui/libraries/freetype/src/base/ftxf86.c diff --git a/components/external/freetype/src/base/md5.c b/components/gui/libraries/freetype/src/base/md5.c similarity index 100% rename from components/external/freetype/src/base/md5.c rename to components/gui/libraries/freetype/src/base/md5.c diff --git a/components/external/freetype/src/base/md5.h b/components/gui/libraries/freetype/src/base/md5.h similarity index 100% rename from components/external/freetype/src/base/md5.h rename to components/gui/libraries/freetype/src/base/md5.h diff --git a/components/external/freetype/src/base/rules.mk b/components/gui/libraries/freetype/src/base/rules.mk similarity index 100% rename from components/external/freetype/src/base/rules.mk rename to components/gui/libraries/freetype/src/base/rules.mk diff --git a/components/external/freetype/src/bdf/Jamfile b/components/gui/libraries/freetype/src/bdf/Jamfile similarity index 100% rename from components/external/freetype/src/bdf/Jamfile rename to components/gui/libraries/freetype/src/bdf/Jamfile diff --git a/components/external/freetype/src/bdf/README b/components/gui/libraries/freetype/src/bdf/README similarity index 100% rename from components/external/freetype/src/bdf/README rename to components/gui/libraries/freetype/src/bdf/README diff --git a/components/external/freetype/src/bdf/bdf.c b/components/gui/libraries/freetype/src/bdf/bdf.c similarity index 100% rename from components/external/freetype/src/bdf/bdf.c rename to components/gui/libraries/freetype/src/bdf/bdf.c diff --git a/components/external/freetype/src/bdf/bdf.h b/components/gui/libraries/freetype/src/bdf/bdf.h similarity index 100% rename from components/external/freetype/src/bdf/bdf.h rename to components/gui/libraries/freetype/src/bdf/bdf.h diff --git a/components/external/freetype/src/bdf/bdfdrivr.c b/components/gui/libraries/freetype/src/bdf/bdfdrivr.c similarity index 100% rename from components/external/freetype/src/bdf/bdfdrivr.c rename to components/gui/libraries/freetype/src/bdf/bdfdrivr.c diff --git a/components/external/freetype/src/bdf/bdfdrivr.h b/components/gui/libraries/freetype/src/bdf/bdfdrivr.h similarity index 100% rename from components/external/freetype/src/bdf/bdfdrivr.h rename to components/gui/libraries/freetype/src/bdf/bdfdrivr.h diff --git a/components/external/freetype/src/bdf/bdferror.h b/components/gui/libraries/freetype/src/bdf/bdferror.h similarity index 100% rename from components/external/freetype/src/bdf/bdferror.h rename to components/gui/libraries/freetype/src/bdf/bdferror.h diff --git a/components/external/freetype/src/bdf/bdflib.c b/components/gui/libraries/freetype/src/bdf/bdflib.c similarity index 100% rename from components/external/freetype/src/bdf/bdflib.c rename to components/gui/libraries/freetype/src/bdf/bdflib.c diff --git a/components/external/freetype/src/bdf/module.mk b/components/gui/libraries/freetype/src/bdf/module.mk similarity index 100% rename from components/external/freetype/src/bdf/module.mk rename to components/gui/libraries/freetype/src/bdf/module.mk diff --git a/components/external/freetype/src/bdf/rules.mk b/components/gui/libraries/freetype/src/bdf/rules.mk similarity index 100% rename from components/external/freetype/src/bdf/rules.mk rename to components/gui/libraries/freetype/src/bdf/rules.mk diff --git a/components/external/freetype/src/bzip2/Jamfile b/components/gui/libraries/freetype/src/bzip2/Jamfile similarity index 100% rename from components/external/freetype/src/bzip2/Jamfile rename to components/gui/libraries/freetype/src/bzip2/Jamfile diff --git a/components/external/freetype/src/bzip2/ftbzip2.c b/components/gui/libraries/freetype/src/bzip2/ftbzip2.c similarity index 100% rename from components/external/freetype/src/bzip2/ftbzip2.c rename to components/gui/libraries/freetype/src/bzip2/ftbzip2.c diff --git a/components/external/freetype/src/bzip2/rules.mk b/components/gui/libraries/freetype/src/bzip2/rules.mk similarity index 100% rename from components/external/freetype/src/bzip2/rules.mk rename to components/gui/libraries/freetype/src/bzip2/rules.mk diff --git a/components/external/freetype/src/cache/Jamfile b/components/gui/libraries/freetype/src/cache/Jamfile similarity index 100% rename from components/external/freetype/src/cache/Jamfile rename to components/gui/libraries/freetype/src/cache/Jamfile diff --git a/components/external/freetype/src/cache/ftcache.c b/components/gui/libraries/freetype/src/cache/ftcache.c similarity index 100% rename from components/external/freetype/src/cache/ftcache.c rename to components/gui/libraries/freetype/src/cache/ftcache.c diff --git a/components/external/freetype/src/cache/ftcbasic.c b/components/gui/libraries/freetype/src/cache/ftcbasic.c similarity index 100% rename from components/external/freetype/src/cache/ftcbasic.c rename to components/gui/libraries/freetype/src/cache/ftcbasic.c diff --git a/components/external/freetype/src/cache/ftccache.c b/components/gui/libraries/freetype/src/cache/ftccache.c similarity index 100% rename from components/external/freetype/src/cache/ftccache.c rename to components/gui/libraries/freetype/src/cache/ftccache.c diff --git a/components/external/freetype/src/cache/ftccache.h b/components/gui/libraries/freetype/src/cache/ftccache.h similarity index 100% rename from components/external/freetype/src/cache/ftccache.h rename to components/gui/libraries/freetype/src/cache/ftccache.h diff --git a/components/external/freetype/src/cache/ftccback.h b/components/gui/libraries/freetype/src/cache/ftccback.h similarity index 100% rename from components/external/freetype/src/cache/ftccback.h rename to components/gui/libraries/freetype/src/cache/ftccback.h diff --git a/components/external/freetype/src/cache/ftccmap.c b/components/gui/libraries/freetype/src/cache/ftccmap.c similarity index 100% rename from components/external/freetype/src/cache/ftccmap.c rename to components/gui/libraries/freetype/src/cache/ftccmap.c diff --git a/components/external/freetype/src/cache/ftcerror.h b/components/gui/libraries/freetype/src/cache/ftcerror.h similarity index 100% rename from components/external/freetype/src/cache/ftcerror.h rename to components/gui/libraries/freetype/src/cache/ftcerror.h diff --git a/components/external/freetype/src/cache/ftcglyph.c b/components/gui/libraries/freetype/src/cache/ftcglyph.c similarity index 100% rename from components/external/freetype/src/cache/ftcglyph.c rename to components/gui/libraries/freetype/src/cache/ftcglyph.c diff --git a/components/external/freetype/src/cache/ftcglyph.h b/components/gui/libraries/freetype/src/cache/ftcglyph.h similarity index 100% rename from components/external/freetype/src/cache/ftcglyph.h rename to components/gui/libraries/freetype/src/cache/ftcglyph.h diff --git a/components/external/freetype/src/cache/ftcimage.c b/components/gui/libraries/freetype/src/cache/ftcimage.c similarity index 100% rename from components/external/freetype/src/cache/ftcimage.c rename to components/gui/libraries/freetype/src/cache/ftcimage.c diff --git a/components/external/freetype/src/cache/ftcimage.h b/components/gui/libraries/freetype/src/cache/ftcimage.h similarity index 100% rename from components/external/freetype/src/cache/ftcimage.h rename to components/gui/libraries/freetype/src/cache/ftcimage.h diff --git a/components/external/freetype/src/cache/ftcmanag.c b/components/gui/libraries/freetype/src/cache/ftcmanag.c similarity index 100% rename from components/external/freetype/src/cache/ftcmanag.c rename to components/gui/libraries/freetype/src/cache/ftcmanag.c diff --git a/components/external/freetype/src/cache/ftcmanag.h b/components/gui/libraries/freetype/src/cache/ftcmanag.h similarity index 100% rename from components/external/freetype/src/cache/ftcmanag.h rename to components/gui/libraries/freetype/src/cache/ftcmanag.h diff --git a/components/external/freetype/src/cache/ftcmru.c b/components/gui/libraries/freetype/src/cache/ftcmru.c similarity index 100% rename from components/external/freetype/src/cache/ftcmru.c rename to components/gui/libraries/freetype/src/cache/ftcmru.c diff --git a/components/external/freetype/src/cache/ftcmru.h b/components/gui/libraries/freetype/src/cache/ftcmru.h similarity index 100% rename from components/external/freetype/src/cache/ftcmru.h rename to components/gui/libraries/freetype/src/cache/ftcmru.h diff --git a/components/external/freetype/src/cache/ftcsbits.c b/components/gui/libraries/freetype/src/cache/ftcsbits.c similarity index 100% rename from components/external/freetype/src/cache/ftcsbits.c rename to components/gui/libraries/freetype/src/cache/ftcsbits.c diff --git a/components/external/freetype/src/cache/ftcsbits.h b/components/gui/libraries/freetype/src/cache/ftcsbits.h similarity index 100% rename from components/external/freetype/src/cache/ftcsbits.h rename to components/gui/libraries/freetype/src/cache/ftcsbits.h diff --git a/components/external/freetype/src/cache/rules.mk b/components/gui/libraries/freetype/src/cache/rules.mk similarity index 100% rename from components/external/freetype/src/cache/rules.mk rename to components/gui/libraries/freetype/src/cache/rules.mk diff --git a/components/external/freetype/src/cff/Jamfile b/components/gui/libraries/freetype/src/cff/Jamfile similarity index 100% rename from components/external/freetype/src/cff/Jamfile rename to components/gui/libraries/freetype/src/cff/Jamfile diff --git a/components/external/freetype/src/cff/cf2arrst.c b/components/gui/libraries/freetype/src/cff/cf2arrst.c similarity index 100% rename from components/external/freetype/src/cff/cf2arrst.c rename to components/gui/libraries/freetype/src/cff/cf2arrst.c diff --git a/components/external/freetype/src/cff/cf2arrst.h b/components/gui/libraries/freetype/src/cff/cf2arrst.h similarity index 100% rename from components/external/freetype/src/cff/cf2arrst.h rename to components/gui/libraries/freetype/src/cff/cf2arrst.h diff --git a/components/external/freetype/src/cff/cf2blues.c b/components/gui/libraries/freetype/src/cff/cf2blues.c similarity index 100% rename from components/external/freetype/src/cff/cf2blues.c rename to components/gui/libraries/freetype/src/cff/cf2blues.c diff --git a/components/external/freetype/src/cff/cf2blues.h b/components/gui/libraries/freetype/src/cff/cf2blues.h similarity index 100% rename from components/external/freetype/src/cff/cf2blues.h rename to components/gui/libraries/freetype/src/cff/cf2blues.h diff --git a/components/external/freetype/src/cff/cf2error.c b/components/gui/libraries/freetype/src/cff/cf2error.c similarity index 100% rename from components/external/freetype/src/cff/cf2error.c rename to components/gui/libraries/freetype/src/cff/cf2error.c diff --git a/components/external/freetype/src/cff/cf2error.h b/components/gui/libraries/freetype/src/cff/cf2error.h similarity index 100% rename from components/external/freetype/src/cff/cf2error.h rename to components/gui/libraries/freetype/src/cff/cf2error.h diff --git a/components/external/freetype/src/cff/cf2fixed.h b/components/gui/libraries/freetype/src/cff/cf2fixed.h similarity index 100% rename from components/external/freetype/src/cff/cf2fixed.h rename to components/gui/libraries/freetype/src/cff/cf2fixed.h diff --git a/components/external/freetype/src/cff/cf2font.c b/components/gui/libraries/freetype/src/cff/cf2font.c similarity index 100% rename from components/external/freetype/src/cff/cf2font.c rename to components/gui/libraries/freetype/src/cff/cf2font.c diff --git a/components/external/freetype/src/cff/cf2font.h b/components/gui/libraries/freetype/src/cff/cf2font.h similarity index 100% rename from components/external/freetype/src/cff/cf2font.h rename to components/gui/libraries/freetype/src/cff/cf2font.h diff --git a/components/external/freetype/src/cff/cf2ft.c b/components/gui/libraries/freetype/src/cff/cf2ft.c similarity index 100% rename from components/external/freetype/src/cff/cf2ft.c rename to components/gui/libraries/freetype/src/cff/cf2ft.c diff --git a/components/external/freetype/src/cff/cf2ft.h b/components/gui/libraries/freetype/src/cff/cf2ft.h similarity index 100% rename from components/external/freetype/src/cff/cf2ft.h rename to components/gui/libraries/freetype/src/cff/cf2ft.h diff --git a/components/external/freetype/src/cff/cf2glue.h b/components/gui/libraries/freetype/src/cff/cf2glue.h similarity index 100% rename from components/external/freetype/src/cff/cf2glue.h rename to components/gui/libraries/freetype/src/cff/cf2glue.h diff --git a/components/external/freetype/src/cff/cf2hints.c b/components/gui/libraries/freetype/src/cff/cf2hints.c similarity index 100% rename from components/external/freetype/src/cff/cf2hints.c rename to components/gui/libraries/freetype/src/cff/cf2hints.c diff --git a/components/external/freetype/src/cff/cf2hints.h b/components/gui/libraries/freetype/src/cff/cf2hints.h similarity index 100% rename from components/external/freetype/src/cff/cf2hints.h rename to components/gui/libraries/freetype/src/cff/cf2hints.h diff --git a/components/external/freetype/src/cff/cf2intrp.c b/components/gui/libraries/freetype/src/cff/cf2intrp.c similarity index 100% rename from components/external/freetype/src/cff/cf2intrp.c rename to components/gui/libraries/freetype/src/cff/cf2intrp.c diff --git a/components/external/freetype/src/cff/cf2intrp.h b/components/gui/libraries/freetype/src/cff/cf2intrp.h similarity index 100% rename from components/external/freetype/src/cff/cf2intrp.h rename to components/gui/libraries/freetype/src/cff/cf2intrp.h diff --git a/components/external/freetype/src/cff/cf2read.c b/components/gui/libraries/freetype/src/cff/cf2read.c similarity index 100% rename from components/external/freetype/src/cff/cf2read.c rename to components/gui/libraries/freetype/src/cff/cf2read.c diff --git a/components/external/freetype/src/cff/cf2read.h b/components/gui/libraries/freetype/src/cff/cf2read.h similarity index 100% rename from components/external/freetype/src/cff/cf2read.h rename to components/gui/libraries/freetype/src/cff/cf2read.h diff --git a/components/external/freetype/src/cff/cf2stack.c b/components/gui/libraries/freetype/src/cff/cf2stack.c similarity index 100% rename from components/external/freetype/src/cff/cf2stack.c rename to components/gui/libraries/freetype/src/cff/cf2stack.c diff --git a/components/external/freetype/src/cff/cf2stack.h b/components/gui/libraries/freetype/src/cff/cf2stack.h similarity index 100% rename from components/external/freetype/src/cff/cf2stack.h rename to components/gui/libraries/freetype/src/cff/cf2stack.h diff --git a/components/external/freetype/src/cff/cf2types.h b/components/gui/libraries/freetype/src/cff/cf2types.h similarity index 100% rename from components/external/freetype/src/cff/cf2types.h rename to components/gui/libraries/freetype/src/cff/cf2types.h diff --git a/components/external/freetype/src/cff/cff.c b/components/gui/libraries/freetype/src/cff/cff.c similarity index 100% rename from components/external/freetype/src/cff/cff.c rename to components/gui/libraries/freetype/src/cff/cff.c diff --git a/components/external/freetype/src/cff/cffcmap.c b/components/gui/libraries/freetype/src/cff/cffcmap.c similarity index 100% rename from components/external/freetype/src/cff/cffcmap.c rename to components/gui/libraries/freetype/src/cff/cffcmap.c diff --git a/components/external/freetype/src/cff/cffcmap.h b/components/gui/libraries/freetype/src/cff/cffcmap.h similarity index 100% rename from components/external/freetype/src/cff/cffcmap.h rename to components/gui/libraries/freetype/src/cff/cffcmap.h diff --git a/components/external/freetype/src/cff/cffdrivr.c b/components/gui/libraries/freetype/src/cff/cffdrivr.c similarity index 100% rename from components/external/freetype/src/cff/cffdrivr.c rename to components/gui/libraries/freetype/src/cff/cffdrivr.c diff --git a/components/external/freetype/src/cff/cffdrivr.h b/components/gui/libraries/freetype/src/cff/cffdrivr.h similarity index 100% rename from components/external/freetype/src/cff/cffdrivr.h rename to components/gui/libraries/freetype/src/cff/cffdrivr.h diff --git a/components/external/freetype/src/cff/cfferrs.h b/components/gui/libraries/freetype/src/cff/cfferrs.h similarity index 100% rename from components/external/freetype/src/cff/cfferrs.h rename to components/gui/libraries/freetype/src/cff/cfferrs.h diff --git a/components/external/freetype/src/cff/cffgload.c b/components/gui/libraries/freetype/src/cff/cffgload.c similarity index 100% rename from components/external/freetype/src/cff/cffgload.c rename to components/gui/libraries/freetype/src/cff/cffgload.c diff --git a/components/external/freetype/src/cff/cffgload.h b/components/gui/libraries/freetype/src/cff/cffgload.h similarity index 100% rename from components/external/freetype/src/cff/cffgload.h rename to components/gui/libraries/freetype/src/cff/cffgload.h diff --git a/components/external/freetype/src/cff/cffload.c b/components/gui/libraries/freetype/src/cff/cffload.c similarity index 100% rename from components/external/freetype/src/cff/cffload.c rename to components/gui/libraries/freetype/src/cff/cffload.c diff --git a/components/external/freetype/src/cff/cffload.h b/components/gui/libraries/freetype/src/cff/cffload.h similarity index 100% rename from components/external/freetype/src/cff/cffload.h rename to components/gui/libraries/freetype/src/cff/cffload.h diff --git a/components/external/freetype/src/cff/cffobjs.c b/components/gui/libraries/freetype/src/cff/cffobjs.c similarity index 100% rename from components/external/freetype/src/cff/cffobjs.c rename to components/gui/libraries/freetype/src/cff/cffobjs.c diff --git a/components/external/freetype/src/cff/cffobjs.h b/components/gui/libraries/freetype/src/cff/cffobjs.h similarity index 100% rename from components/external/freetype/src/cff/cffobjs.h rename to components/gui/libraries/freetype/src/cff/cffobjs.h diff --git a/components/external/freetype/src/cff/cffparse.c b/components/gui/libraries/freetype/src/cff/cffparse.c similarity index 100% rename from components/external/freetype/src/cff/cffparse.c rename to components/gui/libraries/freetype/src/cff/cffparse.c diff --git a/components/external/freetype/src/cff/cffparse.h b/components/gui/libraries/freetype/src/cff/cffparse.h similarity index 100% rename from components/external/freetype/src/cff/cffparse.h rename to components/gui/libraries/freetype/src/cff/cffparse.h diff --git a/components/external/freetype/src/cff/cffpic.c b/components/gui/libraries/freetype/src/cff/cffpic.c similarity index 100% rename from components/external/freetype/src/cff/cffpic.c rename to components/gui/libraries/freetype/src/cff/cffpic.c diff --git a/components/external/freetype/src/cff/cffpic.h b/components/gui/libraries/freetype/src/cff/cffpic.h similarity index 100% rename from components/external/freetype/src/cff/cffpic.h rename to components/gui/libraries/freetype/src/cff/cffpic.h diff --git a/components/external/freetype/src/cff/cfftoken.h b/components/gui/libraries/freetype/src/cff/cfftoken.h similarity index 100% rename from components/external/freetype/src/cff/cfftoken.h rename to components/gui/libraries/freetype/src/cff/cfftoken.h diff --git a/components/external/freetype/src/cff/cfftypes.h b/components/gui/libraries/freetype/src/cff/cfftypes.h similarity index 100% rename from components/external/freetype/src/cff/cfftypes.h rename to components/gui/libraries/freetype/src/cff/cfftypes.h diff --git a/components/external/freetype/src/cff/module.mk b/components/gui/libraries/freetype/src/cff/module.mk similarity index 100% rename from components/external/freetype/src/cff/module.mk rename to components/gui/libraries/freetype/src/cff/module.mk diff --git a/components/external/freetype/src/cff/rules.mk b/components/gui/libraries/freetype/src/cff/rules.mk similarity index 100% rename from components/external/freetype/src/cff/rules.mk rename to components/gui/libraries/freetype/src/cff/rules.mk diff --git a/components/external/freetype/src/cid/Jamfile b/components/gui/libraries/freetype/src/cid/Jamfile similarity index 100% rename from components/external/freetype/src/cid/Jamfile rename to components/gui/libraries/freetype/src/cid/Jamfile diff --git a/components/external/freetype/src/cid/ciderrs.h b/components/gui/libraries/freetype/src/cid/ciderrs.h similarity index 100% rename from components/external/freetype/src/cid/ciderrs.h rename to components/gui/libraries/freetype/src/cid/ciderrs.h diff --git a/components/external/freetype/src/cid/cidgload.c b/components/gui/libraries/freetype/src/cid/cidgload.c similarity index 100% rename from components/external/freetype/src/cid/cidgload.c rename to components/gui/libraries/freetype/src/cid/cidgload.c diff --git a/components/external/freetype/src/cid/cidgload.h b/components/gui/libraries/freetype/src/cid/cidgload.h similarity index 100% rename from components/external/freetype/src/cid/cidgload.h rename to components/gui/libraries/freetype/src/cid/cidgload.h diff --git a/components/external/freetype/src/cid/cidload.c b/components/gui/libraries/freetype/src/cid/cidload.c similarity index 100% rename from components/external/freetype/src/cid/cidload.c rename to components/gui/libraries/freetype/src/cid/cidload.c diff --git a/components/external/freetype/src/cid/cidload.h b/components/gui/libraries/freetype/src/cid/cidload.h similarity index 100% rename from components/external/freetype/src/cid/cidload.h rename to components/gui/libraries/freetype/src/cid/cidload.h diff --git a/components/external/freetype/src/cid/cidobjs.c b/components/gui/libraries/freetype/src/cid/cidobjs.c similarity index 100% rename from components/external/freetype/src/cid/cidobjs.c rename to components/gui/libraries/freetype/src/cid/cidobjs.c diff --git a/components/external/freetype/src/cid/cidobjs.h b/components/gui/libraries/freetype/src/cid/cidobjs.h similarity index 100% rename from components/external/freetype/src/cid/cidobjs.h rename to components/gui/libraries/freetype/src/cid/cidobjs.h diff --git a/components/external/freetype/src/cid/cidparse.c b/components/gui/libraries/freetype/src/cid/cidparse.c similarity index 100% rename from components/external/freetype/src/cid/cidparse.c rename to components/gui/libraries/freetype/src/cid/cidparse.c diff --git a/components/external/freetype/src/cid/cidparse.h b/components/gui/libraries/freetype/src/cid/cidparse.h similarity index 100% rename from components/external/freetype/src/cid/cidparse.h rename to components/gui/libraries/freetype/src/cid/cidparse.h diff --git a/components/external/freetype/src/cid/cidriver.c b/components/gui/libraries/freetype/src/cid/cidriver.c similarity index 100% rename from components/external/freetype/src/cid/cidriver.c rename to components/gui/libraries/freetype/src/cid/cidriver.c diff --git a/components/external/freetype/src/cid/cidriver.h b/components/gui/libraries/freetype/src/cid/cidriver.h similarity index 100% rename from components/external/freetype/src/cid/cidriver.h rename to components/gui/libraries/freetype/src/cid/cidriver.h diff --git a/components/external/freetype/src/cid/cidtoken.h b/components/gui/libraries/freetype/src/cid/cidtoken.h similarity index 100% rename from components/external/freetype/src/cid/cidtoken.h rename to components/gui/libraries/freetype/src/cid/cidtoken.h diff --git a/components/external/freetype/src/cid/module.mk b/components/gui/libraries/freetype/src/cid/module.mk similarity index 100% rename from components/external/freetype/src/cid/module.mk rename to components/gui/libraries/freetype/src/cid/module.mk diff --git a/components/external/freetype/src/cid/rules.mk b/components/gui/libraries/freetype/src/cid/rules.mk similarity index 100% rename from components/external/freetype/src/cid/rules.mk rename to components/gui/libraries/freetype/src/cid/rules.mk diff --git a/components/external/freetype/src/cid/type1cid.c b/components/gui/libraries/freetype/src/cid/type1cid.c similarity index 100% rename from components/external/freetype/src/cid/type1cid.c rename to components/gui/libraries/freetype/src/cid/type1cid.c diff --git a/components/external/freetype/src/gxvalid/Jamfile b/components/gui/libraries/freetype/src/gxvalid/Jamfile similarity index 100% rename from components/external/freetype/src/gxvalid/Jamfile rename to components/gui/libraries/freetype/src/gxvalid/Jamfile diff --git a/components/external/freetype/src/gxvalid/README b/components/gui/libraries/freetype/src/gxvalid/README similarity index 100% rename from components/external/freetype/src/gxvalid/README rename to components/gui/libraries/freetype/src/gxvalid/README diff --git a/components/external/freetype/src/gxvalid/gxvalid.c b/components/gui/libraries/freetype/src/gxvalid/gxvalid.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvalid.c rename to components/gui/libraries/freetype/src/gxvalid/gxvalid.c diff --git a/components/external/freetype/src/gxvalid/gxvalid.h b/components/gui/libraries/freetype/src/gxvalid/gxvalid.h similarity index 100% rename from components/external/freetype/src/gxvalid/gxvalid.h rename to components/gui/libraries/freetype/src/gxvalid/gxvalid.h diff --git a/components/external/freetype/src/gxvalid/gxvbsln.c b/components/gui/libraries/freetype/src/gxvalid/gxvbsln.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvbsln.c rename to components/gui/libraries/freetype/src/gxvalid/gxvbsln.c diff --git a/components/external/freetype/src/gxvalid/gxvcommn.c b/components/gui/libraries/freetype/src/gxvalid/gxvcommn.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvcommn.c rename to components/gui/libraries/freetype/src/gxvalid/gxvcommn.c diff --git a/components/external/freetype/src/gxvalid/gxvcommn.h b/components/gui/libraries/freetype/src/gxvalid/gxvcommn.h similarity index 100% rename from components/external/freetype/src/gxvalid/gxvcommn.h rename to components/gui/libraries/freetype/src/gxvalid/gxvcommn.h diff --git a/components/external/freetype/src/gxvalid/gxverror.h b/components/gui/libraries/freetype/src/gxvalid/gxverror.h similarity index 100% rename from components/external/freetype/src/gxvalid/gxverror.h rename to components/gui/libraries/freetype/src/gxvalid/gxverror.h diff --git a/components/external/freetype/src/gxvalid/gxvfeat.c b/components/gui/libraries/freetype/src/gxvalid/gxvfeat.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvfeat.c rename to components/gui/libraries/freetype/src/gxvalid/gxvfeat.c diff --git a/components/external/freetype/src/gxvalid/gxvfeat.h b/components/gui/libraries/freetype/src/gxvalid/gxvfeat.h similarity index 100% rename from components/external/freetype/src/gxvalid/gxvfeat.h rename to components/gui/libraries/freetype/src/gxvalid/gxvfeat.h diff --git a/components/external/freetype/src/gxvalid/gxvfgen.c b/components/gui/libraries/freetype/src/gxvalid/gxvfgen.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvfgen.c rename to components/gui/libraries/freetype/src/gxvalid/gxvfgen.c diff --git a/components/external/freetype/src/gxvalid/gxvjust.c b/components/gui/libraries/freetype/src/gxvalid/gxvjust.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvjust.c rename to components/gui/libraries/freetype/src/gxvalid/gxvjust.c diff --git a/components/external/freetype/src/gxvalid/gxvkern.c b/components/gui/libraries/freetype/src/gxvalid/gxvkern.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvkern.c rename to components/gui/libraries/freetype/src/gxvalid/gxvkern.c diff --git a/components/external/freetype/src/gxvalid/gxvlcar.c b/components/gui/libraries/freetype/src/gxvalid/gxvlcar.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvlcar.c rename to components/gui/libraries/freetype/src/gxvalid/gxvlcar.c diff --git a/components/external/freetype/src/gxvalid/gxvmod.c b/components/gui/libraries/freetype/src/gxvalid/gxvmod.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmod.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmod.c diff --git a/components/external/freetype/src/gxvalid/gxvmod.h b/components/gui/libraries/freetype/src/gxvalid/gxvmod.h similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmod.h rename to components/gui/libraries/freetype/src/gxvalid/gxvmod.h diff --git a/components/external/freetype/src/gxvalid/gxvmort.c b/components/gui/libraries/freetype/src/gxvalid/gxvmort.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmort.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmort.c diff --git a/components/external/freetype/src/gxvalid/gxvmort.h b/components/gui/libraries/freetype/src/gxvalid/gxvmort.h similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmort.h rename to components/gui/libraries/freetype/src/gxvalid/gxvmort.h diff --git a/components/external/freetype/src/gxvalid/gxvmort0.c b/components/gui/libraries/freetype/src/gxvalid/gxvmort0.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmort0.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmort0.c diff --git a/components/external/freetype/src/gxvalid/gxvmort1.c b/components/gui/libraries/freetype/src/gxvalid/gxvmort1.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmort1.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmort1.c diff --git a/components/external/freetype/src/gxvalid/gxvmort2.c b/components/gui/libraries/freetype/src/gxvalid/gxvmort2.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmort2.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmort2.c diff --git a/components/external/freetype/src/gxvalid/gxvmort4.c b/components/gui/libraries/freetype/src/gxvalid/gxvmort4.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmort4.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmort4.c diff --git a/components/external/freetype/src/gxvalid/gxvmort5.c b/components/gui/libraries/freetype/src/gxvalid/gxvmort5.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmort5.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmort5.c diff --git a/components/external/freetype/src/gxvalid/gxvmorx.c b/components/gui/libraries/freetype/src/gxvalid/gxvmorx.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmorx.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmorx.c diff --git a/components/external/freetype/src/gxvalid/gxvmorx.h b/components/gui/libraries/freetype/src/gxvalid/gxvmorx.h similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmorx.h rename to components/gui/libraries/freetype/src/gxvalid/gxvmorx.h diff --git a/components/external/freetype/src/gxvalid/gxvmorx0.c b/components/gui/libraries/freetype/src/gxvalid/gxvmorx0.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmorx0.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmorx0.c diff --git a/components/external/freetype/src/gxvalid/gxvmorx1.c b/components/gui/libraries/freetype/src/gxvalid/gxvmorx1.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmorx1.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmorx1.c diff --git a/components/external/freetype/src/gxvalid/gxvmorx2.c b/components/gui/libraries/freetype/src/gxvalid/gxvmorx2.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmorx2.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmorx2.c diff --git a/components/external/freetype/src/gxvalid/gxvmorx4.c b/components/gui/libraries/freetype/src/gxvalid/gxvmorx4.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmorx4.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmorx4.c diff --git a/components/external/freetype/src/gxvalid/gxvmorx5.c b/components/gui/libraries/freetype/src/gxvalid/gxvmorx5.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvmorx5.c rename to components/gui/libraries/freetype/src/gxvalid/gxvmorx5.c diff --git a/components/external/freetype/src/gxvalid/gxvopbd.c b/components/gui/libraries/freetype/src/gxvalid/gxvopbd.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvopbd.c rename to components/gui/libraries/freetype/src/gxvalid/gxvopbd.c diff --git a/components/external/freetype/src/gxvalid/gxvprop.c b/components/gui/libraries/freetype/src/gxvalid/gxvprop.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvprop.c rename to components/gui/libraries/freetype/src/gxvalid/gxvprop.c diff --git a/components/external/freetype/src/gxvalid/gxvtrak.c b/components/gui/libraries/freetype/src/gxvalid/gxvtrak.c similarity index 100% rename from components/external/freetype/src/gxvalid/gxvtrak.c rename to components/gui/libraries/freetype/src/gxvalid/gxvtrak.c diff --git a/components/external/freetype/src/gxvalid/module.mk b/components/gui/libraries/freetype/src/gxvalid/module.mk similarity index 100% rename from components/external/freetype/src/gxvalid/module.mk rename to components/gui/libraries/freetype/src/gxvalid/module.mk diff --git a/components/external/freetype/src/gxvalid/rules.mk b/components/gui/libraries/freetype/src/gxvalid/rules.mk similarity index 100% rename from components/external/freetype/src/gxvalid/rules.mk rename to components/gui/libraries/freetype/src/gxvalid/rules.mk diff --git a/components/external/freetype/src/gzip/Jamfile b/components/gui/libraries/freetype/src/gzip/Jamfile similarity index 100% rename from components/external/freetype/src/gzip/Jamfile rename to components/gui/libraries/freetype/src/gzip/Jamfile diff --git a/components/external/freetype/src/gzip/adler32.c b/components/gui/libraries/freetype/src/gzip/adler32.c similarity index 100% rename from components/external/freetype/src/gzip/adler32.c rename to components/gui/libraries/freetype/src/gzip/adler32.c diff --git a/components/external/freetype/src/gzip/ftgzip.c b/components/gui/libraries/freetype/src/gzip/ftgzip.c similarity index 100% rename from components/external/freetype/src/gzip/ftgzip.c rename to components/gui/libraries/freetype/src/gzip/ftgzip.c diff --git a/components/external/freetype/src/gzip/infblock.c b/components/gui/libraries/freetype/src/gzip/infblock.c similarity index 100% rename from components/external/freetype/src/gzip/infblock.c rename to components/gui/libraries/freetype/src/gzip/infblock.c diff --git a/components/external/freetype/src/gzip/infblock.h b/components/gui/libraries/freetype/src/gzip/infblock.h similarity index 100% rename from components/external/freetype/src/gzip/infblock.h rename to components/gui/libraries/freetype/src/gzip/infblock.h diff --git a/components/external/freetype/src/gzip/infcodes.c b/components/gui/libraries/freetype/src/gzip/infcodes.c similarity index 100% rename from components/external/freetype/src/gzip/infcodes.c rename to components/gui/libraries/freetype/src/gzip/infcodes.c diff --git a/components/external/freetype/src/gzip/infcodes.h b/components/gui/libraries/freetype/src/gzip/infcodes.h similarity index 100% rename from components/external/freetype/src/gzip/infcodes.h rename to components/gui/libraries/freetype/src/gzip/infcodes.h diff --git a/components/external/freetype/src/gzip/inffixed.h b/components/gui/libraries/freetype/src/gzip/inffixed.h similarity index 100% rename from components/external/freetype/src/gzip/inffixed.h rename to components/gui/libraries/freetype/src/gzip/inffixed.h diff --git a/components/external/freetype/src/gzip/inflate.c b/components/gui/libraries/freetype/src/gzip/inflate.c similarity index 100% rename from components/external/freetype/src/gzip/inflate.c rename to components/gui/libraries/freetype/src/gzip/inflate.c diff --git a/components/external/freetype/src/gzip/inftrees.c b/components/gui/libraries/freetype/src/gzip/inftrees.c similarity index 100% rename from components/external/freetype/src/gzip/inftrees.c rename to components/gui/libraries/freetype/src/gzip/inftrees.c diff --git a/components/external/freetype/src/gzip/inftrees.h b/components/gui/libraries/freetype/src/gzip/inftrees.h similarity index 100% rename from components/external/freetype/src/gzip/inftrees.h rename to components/gui/libraries/freetype/src/gzip/inftrees.h diff --git a/components/external/freetype/src/gzip/infutil.c b/components/gui/libraries/freetype/src/gzip/infutil.c similarity index 100% rename from components/external/freetype/src/gzip/infutil.c rename to components/gui/libraries/freetype/src/gzip/infutil.c diff --git a/components/external/freetype/src/gzip/infutil.h b/components/gui/libraries/freetype/src/gzip/infutil.h similarity index 100% rename from components/external/freetype/src/gzip/infutil.h rename to components/gui/libraries/freetype/src/gzip/infutil.h diff --git a/components/external/freetype/src/gzip/rules.mk b/components/gui/libraries/freetype/src/gzip/rules.mk similarity index 100% rename from components/external/freetype/src/gzip/rules.mk rename to components/gui/libraries/freetype/src/gzip/rules.mk diff --git a/components/external/freetype/src/gzip/zconf.h b/components/gui/libraries/freetype/src/gzip/zconf.h similarity index 100% rename from components/external/freetype/src/gzip/zconf.h rename to components/gui/libraries/freetype/src/gzip/zconf.h diff --git a/components/external/freetype/src/gzip/zlib.h b/components/gui/libraries/freetype/src/gzip/zlib.h similarity index 100% rename from components/external/freetype/src/gzip/zlib.h rename to components/gui/libraries/freetype/src/gzip/zlib.h diff --git a/components/external/freetype/src/gzip/zutil.c b/components/gui/libraries/freetype/src/gzip/zutil.c similarity index 100% rename from components/external/freetype/src/gzip/zutil.c rename to components/gui/libraries/freetype/src/gzip/zutil.c diff --git a/components/external/freetype/src/gzip/zutil.h b/components/gui/libraries/freetype/src/gzip/zutil.h similarity index 100% rename from components/external/freetype/src/gzip/zutil.h rename to components/gui/libraries/freetype/src/gzip/zutil.h diff --git a/components/external/freetype/src/lzw/Jamfile b/components/gui/libraries/freetype/src/lzw/Jamfile similarity index 100% rename from components/external/freetype/src/lzw/Jamfile rename to components/gui/libraries/freetype/src/lzw/Jamfile diff --git a/components/external/freetype/src/lzw/ftlzw.c b/components/gui/libraries/freetype/src/lzw/ftlzw.c similarity index 100% rename from components/external/freetype/src/lzw/ftlzw.c rename to components/gui/libraries/freetype/src/lzw/ftlzw.c diff --git a/components/external/freetype/src/lzw/ftzopen.c b/components/gui/libraries/freetype/src/lzw/ftzopen.c similarity index 100% rename from components/external/freetype/src/lzw/ftzopen.c rename to components/gui/libraries/freetype/src/lzw/ftzopen.c diff --git a/components/external/freetype/src/lzw/ftzopen.h b/components/gui/libraries/freetype/src/lzw/ftzopen.h similarity index 100% rename from components/external/freetype/src/lzw/ftzopen.h rename to components/gui/libraries/freetype/src/lzw/ftzopen.h diff --git a/components/external/freetype/src/lzw/rules.mk b/components/gui/libraries/freetype/src/lzw/rules.mk similarity index 100% rename from components/external/freetype/src/lzw/rules.mk rename to components/gui/libraries/freetype/src/lzw/rules.mk diff --git a/components/external/freetype/src/otvalid/Jamfile b/components/gui/libraries/freetype/src/otvalid/Jamfile similarity index 100% rename from components/external/freetype/src/otvalid/Jamfile rename to components/gui/libraries/freetype/src/otvalid/Jamfile diff --git a/components/external/freetype/src/otvalid/module.mk b/components/gui/libraries/freetype/src/otvalid/module.mk similarity index 100% rename from components/external/freetype/src/otvalid/module.mk rename to components/gui/libraries/freetype/src/otvalid/module.mk diff --git a/components/external/freetype/src/otvalid/otvalid.c b/components/gui/libraries/freetype/src/otvalid/otvalid.c similarity index 100% rename from components/external/freetype/src/otvalid/otvalid.c rename to components/gui/libraries/freetype/src/otvalid/otvalid.c diff --git a/components/external/freetype/src/otvalid/otvalid.h b/components/gui/libraries/freetype/src/otvalid/otvalid.h similarity index 100% rename from components/external/freetype/src/otvalid/otvalid.h rename to components/gui/libraries/freetype/src/otvalid/otvalid.h diff --git a/components/external/freetype/src/otvalid/otvbase.c b/components/gui/libraries/freetype/src/otvalid/otvbase.c similarity index 100% rename from components/external/freetype/src/otvalid/otvbase.c rename to components/gui/libraries/freetype/src/otvalid/otvbase.c diff --git a/components/external/freetype/src/otvalid/otvcommn.c b/components/gui/libraries/freetype/src/otvalid/otvcommn.c similarity index 100% rename from components/external/freetype/src/otvalid/otvcommn.c rename to components/gui/libraries/freetype/src/otvalid/otvcommn.c diff --git a/components/external/freetype/src/otvalid/otvcommn.h b/components/gui/libraries/freetype/src/otvalid/otvcommn.h similarity index 100% rename from components/external/freetype/src/otvalid/otvcommn.h rename to components/gui/libraries/freetype/src/otvalid/otvcommn.h diff --git a/components/external/freetype/src/otvalid/otverror.h b/components/gui/libraries/freetype/src/otvalid/otverror.h similarity index 100% rename from components/external/freetype/src/otvalid/otverror.h rename to components/gui/libraries/freetype/src/otvalid/otverror.h diff --git a/components/external/freetype/src/otvalid/otvgdef.c b/components/gui/libraries/freetype/src/otvalid/otvgdef.c similarity index 100% rename from components/external/freetype/src/otvalid/otvgdef.c rename to components/gui/libraries/freetype/src/otvalid/otvgdef.c diff --git a/components/external/freetype/src/otvalid/otvgpos.c b/components/gui/libraries/freetype/src/otvalid/otvgpos.c similarity index 100% rename from components/external/freetype/src/otvalid/otvgpos.c rename to components/gui/libraries/freetype/src/otvalid/otvgpos.c diff --git a/components/external/freetype/src/otvalid/otvgpos.h b/components/gui/libraries/freetype/src/otvalid/otvgpos.h similarity index 100% rename from components/external/freetype/src/otvalid/otvgpos.h rename to components/gui/libraries/freetype/src/otvalid/otvgpos.h diff --git a/components/external/freetype/src/otvalid/otvgsub.c b/components/gui/libraries/freetype/src/otvalid/otvgsub.c similarity index 100% rename from components/external/freetype/src/otvalid/otvgsub.c rename to components/gui/libraries/freetype/src/otvalid/otvgsub.c diff --git a/components/external/freetype/src/otvalid/otvjstf.c b/components/gui/libraries/freetype/src/otvalid/otvjstf.c similarity index 100% rename from components/external/freetype/src/otvalid/otvjstf.c rename to components/gui/libraries/freetype/src/otvalid/otvjstf.c diff --git a/components/external/freetype/src/otvalid/otvmath.c b/components/gui/libraries/freetype/src/otvalid/otvmath.c similarity index 100% rename from components/external/freetype/src/otvalid/otvmath.c rename to components/gui/libraries/freetype/src/otvalid/otvmath.c diff --git a/components/external/freetype/src/otvalid/otvmod.c b/components/gui/libraries/freetype/src/otvalid/otvmod.c similarity index 100% rename from components/external/freetype/src/otvalid/otvmod.c rename to components/gui/libraries/freetype/src/otvalid/otvmod.c diff --git a/components/external/freetype/src/otvalid/otvmod.h b/components/gui/libraries/freetype/src/otvalid/otvmod.h similarity index 100% rename from components/external/freetype/src/otvalid/otvmod.h rename to components/gui/libraries/freetype/src/otvalid/otvmod.h diff --git a/components/external/freetype/src/otvalid/rules.mk b/components/gui/libraries/freetype/src/otvalid/rules.mk similarity index 100% rename from components/external/freetype/src/otvalid/rules.mk rename to components/gui/libraries/freetype/src/otvalid/rules.mk diff --git a/components/external/freetype/src/pcf/Jamfile b/components/gui/libraries/freetype/src/pcf/Jamfile similarity index 100% rename from components/external/freetype/src/pcf/Jamfile rename to components/gui/libraries/freetype/src/pcf/Jamfile diff --git a/components/external/freetype/src/pcf/README b/components/gui/libraries/freetype/src/pcf/README similarity index 100% rename from components/external/freetype/src/pcf/README rename to components/gui/libraries/freetype/src/pcf/README diff --git a/components/external/freetype/src/pcf/module.mk b/components/gui/libraries/freetype/src/pcf/module.mk similarity index 100% rename from components/external/freetype/src/pcf/module.mk rename to components/gui/libraries/freetype/src/pcf/module.mk diff --git a/components/external/freetype/src/pcf/pcf.c b/components/gui/libraries/freetype/src/pcf/pcf.c similarity index 100% rename from components/external/freetype/src/pcf/pcf.c rename to components/gui/libraries/freetype/src/pcf/pcf.c diff --git a/components/external/freetype/src/pcf/pcf.h b/components/gui/libraries/freetype/src/pcf/pcf.h similarity index 100% rename from components/external/freetype/src/pcf/pcf.h rename to components/gui/libraries/freetype/src/pcf/pcf.h diff --git a/components/external/freetype/src/pcf/pcfdrivr.c b/components/gui/libraries/freetype/src/pcf/pcfdrivr.c similarity index 100% rename from components/external/freetype/src/pcf/pcfdrivr.c rename to components/gui/libraries/freetype/src/pcf/pcfdrivr.c diff --git a/components/external/freetype/src/pcf/pcfdrivr.h b/components/gui/libraries/freetype/src/pcf/pcfdrivr.h similarity index 100% rename from components/external/freetype/src/pcf/pcfdrivr.h rename to components/gui/libraries/freetype/src/pcf/pcfdrivr.h diff --git a/components/external/freetype/src/pcf/pcferror.h b/components/gui/libraries/freetype/src/pcf/pcferror.h similarity index 100% rename from components/external/freetype/src/pcf/pcferror.h rename to components/gui/libraries/freetype/src/pcf/pcferror.h diff --git a/components/external/freetype/src/pcf/pcfread.c b/components/gui/libraries/freetype/src/pcf/pcfread.c similarity index 100% rename from components/external/freetype/src/pcf/pcfread.c rename to components/gui/libraries/freetype/src/pcf/pcfread.c diff --git a/components/external/freetype/src/pcf/pcfread.h b/components/gui/libraries/freetype/src/pcf/pcfread.h similarity index 100% rename from components/external/freetype/src/pcf/pcfread.h rename to components/gui/libraries/freetype/src/pcf/pcfread.h diff --git a/components/external/freetype/src/pcf/pcfutil.c b/components/gui/libraries/freetype/src/pcf/pcfutil.c similarity index 100% rename from components/external/freetype/src/pcf/pcfutil.c rename to components/gui/libraries/freetype/src/pcf/pcfutil.c diff --git a/components/external/freetype/src/pcf/pcfutil.h b/components/gui/libraries/freetype/src/pcf/pcfutil.h similarity index 100% rename from components/external/freetype/src/pcf/pcfutil.h rename to components/gui/libraries/freetype/src/pcf/pcfutil.h diff --git a/components/external/freetype/src/pcf/rules.mk b/components/gui/libraries/freetype/src/pcf/rules.mk similarity index 100% rename from components/external/freetype/src/pcf/rules.mk rename to components/gui/libraries/freetype/src/pcf/rules.mk diff --git a/components/external/freetype/src/pfr/Jamfile b/components/gui/libraries/freetype/src/pfr/Jamfile similarity index 100% rename from components/external/freetype/src/pfr/Jamfile rename to components/gui/libraries/freetype/src/pfr/Jamfile diff --git a/components/external/freetype/src/pfr/module.mk b/components/gui/libraries/freetype/src/pfr/module.mk similarity index 100% rename from components/external/freetype/src/pfr/module.mk rename to components/gui/libraries/freetype/src/pfr/module.mk diff --git a/components/external/freetype/src/pfr/pfr.c b/components/gui/libraries/freetype/src/pfr/pfr.c similarity index 100% rename from components/external/freetype/src/pfr/pfr.c rename to components/gui/libraries/freetype/src/pfr/pfr.c diff --git a/components/external/freetype/src/pfr/pfrcmap.c b/components/gui/libraries/freetype/src/pfr/pfrcmap.c similarity index 100% rename from components/external/freetype/src/pfr/pfrcmap.c rename to components/gui/libraries/freetype/src/pfr/pfrcmap.c diff --git a/components/external/freetype/src/pfr/pfrcmap.h b/components/gui/libraries/freetype/src/pfr/pfrcmap.h similarity index 100% rename from components/external/freetype/src/pfr/pfrcmap.h rename to components/gui/libraries/freetype/src/pfr/pfrcmap.h diff --git a/components/external/freetype/src/pfr/pfrdrivr.c b/components/gui/libraries/freetype/src/pfr/pfrdrivr.c similarity index 100% rename from components/external/freetype/src/pfr/pfrdrivr.c rename to components/gui/libraries/freetype/src/pfr/pfrdrivr.c diff --git a/components/external/freetype/src/pfr/pfrdrivr.h b/components/gui/libraries/freetype/src/pfr/pfrdrivr.h similarity index 100% rename from components/external/freetype/src/pfr/pfrdrivr.h rename to components/gui/libraries/freetype/src/pfr/pfrdrivr.h diff --git a/components/external/freetype/src/pfr/pfrerror.h b/components/gui/libraries/freetype/src/pfr/pfrerror.h similarity index 100% rename from components/external/freetype/src/pfr/pfrerror.h rename to components/gui/libraries/freetype/src/pfr/pfrerror.h diff --git a/components/external/freetype/src/pfr/pfrgload.c b/components/gui/libraries/freetype/src/pfr/pfrgload.c similarity index 100% rename from components/external/freetype/src/pfr/pfrgload.c rename to components/gui/libraries/freetype/src/pfr/pfrgload.c diff --git a/components/external/freetype/src/pfr/pfrgload.h b/components/gui/libraries/freetype/src/pfr/pfrgload.h similarity index 100% rename from components/external/freetype/src/pfr/pfrgload.h rename to components/gui/libraries/freetype/src/pfr/pfrgload.h diff --git a/components/external/freetype/src/pfr/pfrload.c b/components/gui/libraries/freetype/src/pfr/pfrload.c similarity index 100% rename from components/external/freetype/src/pfr/pfrload.c rename to components/gui/libraries/freetype/src/pfr/pfrload.c diff --git a/components/external/freetype/src/pfr/pfrload.h b/components/gui/libraries/freetype/src/pfr/pfrload.h similarity index 100% rename from components/external/freetype/src/pfr/pfrload.h rename to components/gui/libraries/freetype/src/pfr/pfrload.h diff --git a/components/external/freetype/src/pfr/pfrobjs.c b/components/gui/libraries/freetype/src/pfr/pfrobjs.c similarity index 100% rename from components/external/freetype/src/pfr/pfrobjs.c rename to components/gui/libraries/freetype/src/pfr/pfrobjs.c diff --git a/components/external/freetype/src/pfr/pfrobjs.h b/components/gui/libraries/freetype/src/pfr/pfrobjs.h similarity index 100% rename from components/external/freetype/src/pfr/pfrobjs.h rename to components/gui/libraries/freetype/src/pfr/pfrobjs.h diff --git a/components/external/freetype/src/pfr/pfrsbit.c b/components/gui/libraries/freetype/src/pfr/pfrsbit.c similarity index 100% rename from components/external/freetype/src/pfr/pfrsbit.c rename to components/gui/libraries/freetype/src/pfr/pfrsbit.c diff --git a/components/external/freetype/src/pfr/pfrsbit.h b/components/gui/libraries/freetype/src/pfr/pfrsbit.h similarity index 100% rename from components/external/freetype/src/pfr/pfrsbit.h rename to components/gui/libraries/freetype/src/pfr/pfrsbit.h diff --git a/components/external/freetype/src/pfr/pfrtypes.h b/components/gui/libraries/freetype/src/pfr/pfrtypes.h similarity index 100% rename from components/external/freetype/src/pfr/pfrtypes.h rename to components/gui/libraries/freetype/src/pfr/pfrtypes.h diff --git a/components/external/freetype/src/pfr/rules.mk b/components/gui/libraries/freetype/src/pfr/rules.mk similarity index 100% rename from components/external/freetype/src/pfr/rules.mk rename to components/gui/libraries/freetype/src/pfr/rules.mk diff --git a/components/external/freetype/src/psaux/Jamfile b/components/gui/libraries/freetype/src/psaux/Jamfile similarity index 100% rename from components/external/freetype/src/psaux/Jamfile rename to components/gui/libraries/freetype/src/psaux/Jamfile diff --git a/components/external/freetype/src/psaux/afmparse.c b/components/gui/libraries/freetype/src/psaux/afmparse.c similarity index 100% rename from components/external/freetype/src/psaux/afmparse.c rename to components/gui/libraries/freetype/src/psaux/afmparse.c diff --git a/components/external/freetype/src/psaux/afmparse.h b/components/gui/libraries/freetype/src/psaux/afmparse.h similarity index 100% rename from components/external/freetype/src/psaux/afmparse.h rename to components/gui/libraries/freetype/src/psaux/afmparse.h diff --git a/components/external/freetype/src/psaux/module.mk b/components/gui/libraries/freetype/src/psaux/module.mk similarity index 100% rename from components/external/freetype/src/psaux/module.mk rename to components/gui/libraries/freetype/src/psaux/module.mk diff --git a/components/external/freetype/src/psaux/psaux.c b/components/gui/libraries/freetype/src/psaux/psaux.c similarity index 100% rename from components/external/freetype/src/psaux/psaux.c rename to components/gui/libraries/freetype/src/psaux/psaux.c diff --git a/components/external/freetype/src/psaux/psauxerr.h b/components/gui/libraries/freetype/src/psaux/psauxerr.h similarity index 100% rename from components/external/freetype/src/psaux/psauxerr.h rename to components/gui/libraries/freetype/src/psaux/psauxerr.h diff --git a/components/external/freetype/src/psaux/psauxmod.c b/components/gui/libraries/freetype/src/psaux/psauxmod.c similarity index 100% rename from components/external/freetype/src/psaux/psauxmod.c rename to components/gui/libraries/freetype/src/psaux/psauxmod.c diff --git a/components/external/freetype/src/psaux/psauxmod.h b/components/gui/libraries/freetype/src/psaux/psauxmod.h similarity index 100% rename from components/external/freetype/src/psaux/psauxmod.h rename to components/gui/libraries/freetype/src/psaux/psauxmod.h diff --git a/components/external/freetype/src/psaux/psconv.c b/components/gui/libraries/freetype/src/psaux/psconv.c similarity index 100% rename from components/external/freetype/src/psaux/psconv.c rename to components/gui/libraries/freetype/src/psaux/psconv.c diff --git a/components/external/freetype/src/psaux/psconv.h b/components/gui/libraries/freetype/src/psaux/psconv.h similarity index 100% rename from components/external/freetype/src/psaux/psconv.h rename to components/gui/libraries/freetype/src/psaux/psconv.h diff --git a/components/external/freetype/src/psaux/psobjs.c b/components/gui/libraries/freetype/src/psaux/psobjs.c similarity index 100% rename from components/external/freetype/src/psaux/psobjs.c rename to components/gui/libraries/freetype/src/psaux/psobjs.c diff --git a/components/external/freetype/src/psaux/psobjs.h b/components/gui/libraries/freetype/src/psaux/psobjs.h similarity index 100% rename from components/external/freetype/src/psaux/psobjs.h rename to components/gui/libraries/freetype/src/psaux/psobjs.h diff --git a/components/external/freetype/src/psaux/rules.mk b/components/gui/libraries/freetype/src/psaux/rules.mk similarity index 100% rename from components/external/freetype/src/psaux/rules.mk rename to components/gui/libraries/freetype/src/psaux/rules.mk diff --git a/components/external/freetype/src/psaux/t1cmap.c b/components/gui/libraries/freetype/src/psaux/t1cmap.c similarity index 100% rename from components/external/freetype/src/psaux/t1cmap.c rename to components/gui/libraries/freetype/src/psaux/t1cmap.c diff --git a/components/external/freetype/src/psaux/t1cmap.h b/components/gui/libraries/freetype/src/psaux/t1cmap.h similarity index 100% rename from components/external/freetype/src/psaux/t1cmap.h rename to components/gui/libraries/freetype/src/psaux/t1cmap.h diff --git a/components/external/freetype/src/psaux/t1decode.c b/components/gui/libraries/freetype/src/psaux/t1decode.c similarity index 100% rename from components/external/freetype/src/psaux/t1decode.c rename to components/gui/libraries/freetype/src/psaux/t1decode.c diff --git a/components/external/freetype/src/psaux/t1decode.h b/components/gui/libraries/freetype/src/psaux/t1decode.h similarity index 100% rename from components/external/freetype/src/psaux/t1decode.h rename to components/gui/libraries/freetype/src/psaux/t1decode.h diff --git a/components/external/freetype/src/pshinter/Jamfile b/components/gui/libraries/freetype/src/pshinter/Jamfile similarity index 100% rename from components/external/freetype/src/pshinter/Jamfile rename to components/gui/libraries/freetype/src/pshinter/Jamfile diff --git a/components/external/freetype/src/pshinter/module.mk b/components/gui/libraries/freetype/src/pshinter/module.mk similarity index 100% rename from components/external/freetype/src/pshinter/module.mk rename to components/gui/libraries/freetype/src/pshinter/module.mk diff --git a/components/external/freetype/src/pshinter/pshalgo.c b/components/gui/libraries/freetype/src/pshinter/pshalgo.c similarity index 100% rename from components/external/freetype/src/pshinter/pshalgo.c rename to components/gui/libraries/freetype/src/pshinter/pshalgo.c diff --git a/components/external/freetype/src/pshinter/pshalgo.h b/components/gui/libraries/freetype/src/pshinter/pshalgo.h similarity index 100% rename from components/external/freetype/src/pshinter/pshalgo.h rename to components/gui/libraries/freetype/src/pshinter/pshalgo.h diff --git a/components/external/freetype/src/pshinter/pshglob.c b/components/gui/libraries/freetype/src/pshinter/pshglob.c similarity index 100% rename from components/external/freetype/src/pshinter/pshglob.c rename to components/gui/libraries/freetype/src/pshinter/pshglob.c diff --git a/components/external/freetype/src/pshinter/pshglob.h b/components/gui/libraries/freetype/src/pshinter/pshglob.h similarity index 100% rename from components/external/freetype/src/pshinter/pshglob.h rename to components/gui/libraries/freetype/src/pshinter/pshglob.h diff --git a/components/external/freetype/src/pshinter/pshinter.c b/components/gui/libraries/freetype/src/pshinter/pshinter.c similarity index 100% rename from components/external/freetype/src/pshinter/pshinter.c rename to components/gui/libraries/freetype/src/pshinter/pshinter.c diff --git a/components/external/freetype/src/pshinter/pshmod.c b/components/gui/libraries/freetype/src/pshinter/pshmod.c similarity index 100% rename from components/external/freetype/src/pshinter/pshmod.c rename to components/gui/libraries/freetype/src/pshinter/pshmod.c diff --git a/components/external/freetype/src/pshinter/pshmod.h b/components/gui/libraries/freetype/src/pshinter/pshmod.h similarity index 100% rename from components/external/freetype/src/pshinter/pshmod.h rename to components/gui/libraries/freetype/src/pshinter/pshmod.h diff --git a/components/external/freetype/src/pshinter/pshnterr.h b/components/gui/libraries/freetype/src/pshinter/pshnterr.h similarity index 100% rename from components/external/freetype/src/pshinter/pshnterr.h rename to components/gui/libraries/freetype/src/pshinter/pshnterr.h diff --git a/components/external/freetype/src/pshinter/pshpic.c b/components/gui/libraries/freetype/src/pshinter/pshpic.c similarity index 100% rename from components/external/freetype/src/pshinter/pshpic.c rename to components/gui/libraries/freetype/src/pshinter/pshpic.c diff --git a/components/external/freetype/src/pshinter/pshpic.h b/components/gui/libraries/freetype/src/pshinter/pshpic.h similarity index 100% rename from components/external/freetype/src/pshinter/pshpic.h rename to components/gui/libraries/freetype/src/pshinter/pshpic.h diff --git a/components/external/freetype/src/pshinter/pshrec.c b/components/gui/libraries/freetype/src/pshinter/pshrec.c similarity index 100% rename from components/external/freetype/src/pshinter/pshrec.c rename to components/gui/libraries/freetype/src/pshinter/pshrec.c diff --git a/components/external/freetype/src/pshinter/pshrec.h b/components/gui/libraries/freetype/src/pshinter/pshrec.h similarity index 100% rename from components/external/freetype/src/pshinter/pshrec.h rename to components/gui/libraries/freetype/src/pshinter/pshrec.h diff --git a/components/external/freetype/src/pshinter/rules.mk b/components/gui/libraries/freetype/src/pshinter/rules.mk similarity index 100% rename from components/external/freetype/src/pshinter/rules.mk rename to components/gui/libraries/freetype/src/pshinter/rules.mk diff --git a/components/external/freetype/src/psnames/Jamfile b/components/gui/libraries/freetype/src/psnames/Jamfile similarity index 100% rename from components/external/freetype/src/psnames/Jamfile rename to components/gui/libraries/freetype/src/psnames/Jamfile diff --git a/components/external/freetype/src/psnames/module.mk b/components/gui/libraries/freetype/src/psnames/module.mk similarity index 100% rename from components/external/freetype/src/psnames/module.mk rename to components/gui/libraries/freetype/src/psnames/module.mk diff --git a/components/external/freetype/src/psnames/psmodule.c b/components/gui/libraries/freetype/src/psnames/psmodule.c similarity index 100% rename from components/external/freetype/src/psnames/psmodule.c rename to components/gui/libraries/freetype/src/psnames/psmodule.c diff --git a/components/external/freetype/src/psnames/psmodule.h b/components/gui/libraries/freetype/src/psnames/psmodule.h similarity index 100% rename from components/external/freetype/src/psnames/psmodule.h rename to components/gui/libraries/freetype/src/psnames/psmodule.h diff --git a/components/external/freetype/src/psnames/psnamerr.h b/components/gui/libraries/freetype/src/psnames/psnamerr.h similarity index 100% rename from components/external/freetype/src/psnames/psnamerr.h rename to components/gui/libraries/freetype/src/psnames/psnamerr.h diff --git a/components/external/freetype/src/psnames/psnames.c b/components/gui/libraries/freetype/src/psnames/psnames.c similarity index 100% rename from components/external/freetype/src/psnames/psnames.c rename to components/gui/libraries/freetype/src/psnames/psnames.c diff --git a/components/external/freetype/src/psnames/pspic.c b/components/gui/libraries/freetype/src/psnames/pspic.c similarity index 100% rename from components/external/freetype/src/psnames/pspic.c rename to components/gui/libraries/freetype/src/psnames/pspic.c diff --git a/components/external/freetype/src/psnames/pspic.h b/components/gui/libraries/freetype/src/psnames/pspic.h similarity index 100% rename from components/external/freetype/src/psnames/pspic.h rename to components/gui/libraries/freetype/src/psnames/pspic.h diff --git a/components/external/freetype/src/psnames/pstables.h b/components/gui/libraries/freetype/src/psnames/pstables.h similarity index 100% rename from components/external/freetype/src/psnames/pstables.h rename to components/gui/libraries/freetype/src/psnames/pstables.h diff --git a/components/external/freetype/src/psnames/rules.mk b/components/gui/libraries/freetype/src/psnames/rules.mk similarity index 100% rename from components/external/freetype/src/psnames/rules.mk rename to components/gui/libraries/freetype/src/psnames/rules.mk diff --git a/components/external/freetype/src/raster/Jamfile b/components/gui/libraries/freetype/src/raster/Jamfile similarity index 100% rename from components/external/freetype/src/raster/Jamfile rename to components/gui/libraries/freetype/src/raster/Jamfile diff --git a/components/external/freetype/src/raster/ftmisc.h b/components/gui/libraries/freetype/src/raster/ftmisc.h similarity index 100% rename from components/external/freetype/src/raster/ftmisc.h rename to components/gui/libraries/freetype/src/raster/ftmisc.h diff --git a/components/external/freetype/src/raster/ftraster.c b/components/gui/libraries/freetype/src/raster/ftraster.c similarity index 100% rename from components/external/freetype/src/raster/ftraster.c rename to components/gui/libraries/freetype/src/raster/ftraster.c diff --git a/components/external/freetype/src/raster/ftraster.h b/components/gui/libraries/freetype/src/raster/ftraster.h similarity index 100% rename from components/external/freetype/src/raster/ftraster.h rename to components/gui/libraries/freetype/src/raster/ftraster.h diff --git a/components/external/freetype/src/raster/ftrend1.c b/components/gui/libraries/freetype/src/raster/ftrend1.c similarity index 100% rename from components/external/freetype/src/raster/ftrend1.c rename to components/gui/libraries/freetype/src/raster/ftrend1.c diff --git a/components/external/freetype/src/raster/ftrend1.h b/components/gui/libraries/freetype/src/raster/ftrend1.h similarity index 100% rename from components/external/freetype/src/raster/ftrend1.h rename to components/gui/libraries/freetype/src/raster/ftrend1.h diff --git a/components/external/freetype/src/raster/module.mk b/components/gui/libraries/freetype/src/raster/module.mk similarity index 100% rename from components/external/freetype/src/raster/module.mk rename to components/gui/libraries/freetype/src/raster/module.mk diff --git a/components/external/freetype/src/raster/raster.c b/components/gui/libraries/freetype/src/raster/raster.c similarity index 100% rename from components/external/freetype/src/raster/raster.c rename to components/gui/libraries/freetype/src/raster/raster.c diff --git a/components/external/freetype/src/raster/rasterrs.h b/components/gui/libraries/freetype/src/raster/rasterrs.h similarity index 100% rename from components/external/freetype/src/raster/rasterrs.h rename to components/gui/libraries/freetype/src/raster/rasterrs.h diff --git a/components/external/freetype/src/raster/rastpic.c b/components/gui/libraries/freetype/src/raster/rastpic.c similarity index 100% rename from components/external/freetype/src/raster/rastpic.c rename to components/gui/libraries/freetype/src/raster/rastpic.c diff --git a/components/external/freetype/src/raster/rastpic.h b/components/gui/libraries/freetype/src/raster/rastpic.h similarity index 100% rename from components/external/freetype/src/raster/rastpic.h rename to components/gui/libraries/freetype/src/raster/rastpic.h diff --git a/components/external/freetype/src/raster/rules.mk b/components/gui/libraries/freetype/src/raster/rules.mk similarity index 100% rename from components/external/freetype/src/raster/rules.mk rename to components/gui/libraries/freetype/src/raster/rules.mk diff --git a/components/external/freetype/src/sfnt/Jamfile b/components/gui/libraries/freetype/src/sfnt/Jamfile similarity index 100% rename from components/external/freetype/src/sfnt/Jamfile rename to components/gui/libraries/freetype/src/sfnt/Jamfile diff --git a/components/external/freetype/src/sfnt/module.mk b/components/gui/libraries/freetype/src/sfnt/module.mk similarity index 100% rename from components/external/freetype/src/sfnt/module.mk rename to components/gui/libraries/freetype/src/sfnt/module.mk diff --git a/components/external/freetype/src/sfnt/pngshim.c b/components/gui/libraries/freetype/src/sfnt/pngshim.c similarity index 100% rename from components/external/freetype/src/sfnt/pngshim.c rename to components/gui/libraries/freetype/src/sfnt/pngshim.c diff --git a/components/external/freetype/src/sfnt/pngshim.h b/components/gui/libraries/freetype/src/sfnt/pngshim.h similarity index 100% rename from components/external/freetype/src/sfnt/pngshim.h rename to components/gui/libraries/freetype/src/sfnt/pngshim.h diff --git a/components/external/freetype/src/sfnt/rules.mk b/components/gui/libraries/freetype/src/sfnt/rules.mk similarity index 100% rename from components/external/freetype/src/sfnt/rules.mk rename to components/gui/libraries/freetype/src/sfnt/rules.mk diff --git a/components/external/freetype/src/sfnt/sfdriver.c b/components/gui/libraries/freetype/src/sfnt/sfdriver.c similarity index 100% rename from components/external/freetype/src/sfnt/sfdriver.c rename to components/gui/libraries/freetype/src/sfnt/sfdriver.c diff --git a/components/external/freetype/src/sfnt/sfdriver.h b/components/gui/libraries/freetype/src/sfnt/sfdriver.h similarity index 100% rename from components/external/freetype/src/sfnt/sfdriver.h rename to components/gui/libraries/freetype/src/sfnt/sfdriver.h diff --git a/components/external/freetype/src/sfnt/sferrors.h b/components/gui/libraries/freetype/src/sfnt/sferrors.h similarity index 100% rename from components/external/freetype/src/sfnt/sferrors.h rename to components/gui/libraries/freetype/src/sfnt/sferrors.h diff --git a/components/external/freetype/src/sfnt/sfnt.c b/components/gui/libraries/freetype/src/sfnt/sfnt.c similarity index 100% rename from components/external/freetype/src/sfnt/sfnt.c rename to components/gui/libraries/freetype/src/sfnt/sfnt.c diff --git a/components/external/freetype/src/sfnt/sfntpic.c b/components/gui/libraries/freetype/src/sfnt/sfntpic.c similarity index 100% rename from components/external/freetype/src/sfnt/sfntpic.c rename to components/gui/libraries/freetype/src/sfnt/sfntpic.c diff --git a/components/external/freetype/src/sfnt/sfntpic.h b/components/gui/libraries/freetype/src/sfnt/sfntpic.h similarity index 100% rename from components/external/freetype/src/sfnt/sfntpic.h rename to components/gui/libraries/freetype/src/sfnt/sfntpic.h diff --git a/components/external/freetype/src/sfnt/sfobjs.c b/components/gui/libraries/freetype/src/sfnt/sfobjs.c similarity index 100% rename from components/external/freetype/src/sfnt/sfobjs.c rename to components/gui/libraries/freetype/src/sfnt/sfobjs.c diff --git a/components/external/freetype/src/sfnt/sfobjs.h b/components/gui/libraries/freetype/src/sfnt/sfobjs.h similarity index 100% rename from components/external/freetype/src/sfnt/sfobjs.h rename to components/gui/libraries/freetype/src/sfnt/sfobjs.h diff --git a/components/external/freetype/src/sfnt/ttbdf.c b/components/gui/libraries/freetype/src/sfnt/ttbdf.c similarity index 100% rename from components/external/freetype/src/sfnt/ttbdf.c rename to components/gui/libraries/freetype/src/sfnt/ttbdf.c diff --git a/components/external/freetype/src/sfnt/ttbdf.h b/components/gui/libraries/freetype/src/sfnt/ttbdf.h similarity index 100% rename from components/external/freetype/src/sfnt/ttbdf.h rename to components/gui/libraries/freetype/src/sfnt/ttbdf.h diff --git a/components/external/freetype/src/sfnt/ttcmap.c b/components/gui/libraries/freetype/src/sfnt/ttcmap.c similarity index 100% rename from components/external/freetype/src/sfnt/ttcmap.c rename to components/gui/libraries/freetype/src/sfnt/ttcmap.c diff --git a/components/external/freetype/src/sfnt/ttcmap.h b/components/gui/libraries/freetype/src/sfnt/ttcmap.h similarity index 100% rename from components/external/freetype/src/sfnt/ttcmap.h rename to components/gui/libraries/freetype/src/sfnt/ttcmap.h diff --git a/components/external/freetype/src/sfnt/ttcmapc.h b/components/gui/libraries/freetype/src/sfnt/ttcmapc.h similarity index 100% rename from components/external/freetype/src/sfnt/ttcmapc.h rename to components/gui/libraries/freetype/src/sfnt/ttcmapc.h diff --git a/components/external/freetype/src/sfnt/ttkern.c b/components/gui/libraries/freetype/src/sfnt/ttkern.c similarity index 100% rename from components/external/freetype/src/sfnt/ttkern.c rename to components/gui/libraries/freetype/src/sfnt/ttkern.c diff --git a/components/external/freetype/src/sfnt/ttkern.h b/components/gui/libraries/freetype/src/sfnt/ttkern.h similarity index 100% rename from components/external/freetype/src/sfnt/ttkern.h rename to components/gui/libraries/freetype/src/sfnt/ttkern.h diff --git a/components/external/freetype/src/sfnt/ttload.c b/components/gui/libraries/freetype/src/sfnt/ttload.c similarity index 100% rename from components/external/freetype/src/sfnt/ttload.c rename to components/gui/libraries/freetype/src/sfnt/ttload.c diff --git a/components/external/freetype/src/sfnt/ttload.h b/components/gui/libraries/freetype/src/sfnt/ttload.h similarity index 100% rename from components/external/freetype/src/sfnt/ttload.h rename to components/gui/libraries/freetype/src/sfnt/ttload.h diff --git a/components/external/freetype/src/sfnt/ttmtx.c b/components/gui/libraries/freetype/src/sfnt/ttmtx.c similarity index 100% rename from components/external/freetype/src/sfnt/ttmtx.c rename to components/gui/libraries/freetype/src/sfnt/ttmtx.c diff --git a/components/external/freetype/src/sfnt/ttmtx.h b/components/gui/libraries/freetype/src/sfnt/ttmtx.h similarity index 100% rename from components/external/freetype/src/sfnt/ttmtx.h rename to components/gui/libraries/freetype/src/sfnt/ttmtx.h diff --git a/components/external/freetype/src/sfnt/ttpost.c b/components/gui/libraries/freetype/src/sfnt/ttpost.c similarity index 100% rename from components/external/freetype/src/sfnt/ttpost.c rename to components/gui/libraries/freetype/src/sfnt/ttpost.c diff --git a/components/external/freetype/src/sfnt/ttpost.h b/components/gui/libraries/freetype/src/sfnt/ttpost.h similarity index 100% rename from components/external/freetype/src/sfnt/ttpost.h rename to components/gui/libraries/freetype/src/sfnt/ttpost.h diff --git a/components/external/freetype/src/sfnt/ttsbit.c b/components/gui/libraries/freetype/src/sfnt/ttsbit.c similarity index 100% rename from components/external/freetype/src/sfnt/ttsbit.c rename to components/gui/libraries/freetype/src/sfnt/ttsbit.c diff --git a/components/external/freetype/src/sfnt/ttsbit.h b/components/gui/libraries/freetype/src/sfnt/ttsbit.h similarity index 100% rename from components/external/freetype/src/sfnt/ttsbit.h rename to components/gui/libraries/freetype/src/sfnt/ttsbit.h diff --git a/components/external/freetype/src/smooth/Jamfile b/components/gui/libraries/freetype/src/smooth/Jamfile similarity index 100% rename from components/external/freetype/src/smooth/Jamfile rename to components/gui/libraries/freetype/src/smooth/Jamfile diff --git a/components/external/freetype/src/smooth/ftgrays.c b/components/gui/libraries/freetype/src/smooth/ftgrays.c similarity index 100% rename from components/external/freetype/src/smooth/ftgrays.c rename to components/gui/libraries/freetype/src/smooth/ftgrays.c diff --git a/components/external/freetype/src/smooth/ftgrays.h b/components/gui/libraries/freetype/src/smooth/ftgrays.h similarity index 100% rename from components/external/freetype/src/smooth/ftgrays.h rename to components/gui/libraries/freetype/src/smooth/ftgrays.h diff --git a/components/external/freetype/src/smooth/ftsmerrs.h b/components/gui/libraries/freetype/src/smooth/ftsmerrs.h similarity index 100% rename from components/external/freetype/src/smooth/ftsmerrs.h rename to components/gui/libraries/freetype/src/smooth/ftsmerrs.h diff --git a/components/external/freetype/src/smooth/ftsmooth.c b/components/gui/libraries/freetype/src/smooth/ftsmooth.c similarity index 100% rename from components/external/freetype/src/smooth/ftsmooth.c rename to components/gui/libraries/freetype/src/smooth/ftsmooth.c diff --git a/components/external/freetype/src/smooth/ftsmooth.h b/components/gui/libraries/freetype/src/smooth/ftsmooth.h similarity index 100% rename from components/external/freetype/src/smooth/ftsmooth.h rename to components/gui/libraries/freetype/src/smooth/ftsmooth.h diff --git a/components/external/freetype/src/smooth/ftspic.c b/components/gui/libraries/freetype/src/smooth/ftspic.c similarity index 100% rename from components/external/freetype/src/smooth/ftspic.c rename to components/gui/libraries/freetype/src/smooth/ftspic.c diff --git a/components/external/freetype/src/smooth/ftspic.h b/components/gui/libraries/freetype/src/smooth/ftspic.h similarity index 100% rename from components/external/freetype/src/smooth/ftspic.h rename to components/gui/libraries/freetype/src/smooth/ftspic.h diff --git a/components/external/freetype/src/smooth/module.mk b/components/gui/libraries/freetype/src/smooth/module.mk similarity index 100% rename from components/external/freetype/src/smooth/module.mk rename to components/gui/libraries/freetype/src/smooth/module.mk diff --git a/components/external/freetype/src/smooth/rules.mk b/components/gui/libraries/freetype/src/smooth/rules.mk similarity index 100% rename from components/external/freetype/src/smooth/rules.mk rename to components/gui/libraries/freetype/src/smooth/rules.mk diff --git a/components/external/freetype/src/smooth/smooth.c b/components/gui/libraries/freetype/src/smooth/smooth.c similarity index 100% rename from components/external/freetype/src/smooth/smooth.c rename to components/gui/libraries/freetype/src/smooth/smooth.c diff --git a/components/external/freetype/src/tools/Jamfile b/components/gui/libraries/freetype/src/tools/Jamfile similarity index 100% rename from components/external/freetype/src/tools/Jamfile rename to components/gui/libraries/freetype/src/tools/Jamfile diff --git a/components/external/freetype/src/tools/afblue.pl b/components/gui/libraries/freetype/src/tools/afblue.pl similarity index 100% rename from components/external/freetype/src/tools/afblue.pl rename to components/gui/libraries/freetype/src/tools/afblue.pl diff --git a/components/external/freetype/src/tools/apinames.c b/components/gui/libraries/freetype/src/tools/apinames.c similarity index 100% rename from components/external/freetype/src/tools/apinames.c rename to components/gui/libraries/freetype/src/tools/apinames.c diff --git a/components/external/freetype/src/tools/chktrcmp.py b/components/gui/libraries/freetype/src/tools/chktrcmp.py similarity index 100% rename from components/external/freetype/src/tools/chktrcmp.py rename to components/gui/libraries/freetype/src/tools/chktrcmp.py diff --git a/components/external/freetype/src/tools/cordic.py b/components/gui/libraries/freetype/src/tools/cordic.py similarity index 100% rename from components/external/freetype/src/tools/cordic.py rename to components/gui/libraries/freetype/src/tools/cordic.py diff --git a/components/external/freetype/src/tools/docmaker/.gitignore b/components/gui/libraries/freetype/src/tools/docmaker/.gitignore similarity index 100% rename from components/external/freetype/src/tools/docmaker/.gitignore rename to components/gui/libraries/freetype/src/tools/docmaker/.gitignore diff --git a/components/external/freetype/src/tools/docmaker/content.py b/components/gui/libraries/freetype/src/tools/docmaker/content.py similarity index 100% rename from components/external/freetype/src/tools/docmaker/content.py rename to components/gui/libraries/freetype/src/tools/docmaker/content.py diff --git a/components/external/freetype/src/tools/docmaker/docbeauty.py b/components/gui/libraries/freetype/src/tools/docmaker/docbeauty.py similarity index 100% rename from components/external/freetype/src/tools/docmaker/docbeauty.py rename to components/gui/libraries/freetype/src/tools/docmaker/docbeauty.py diff --git a/components/external/freetype/src/tools/docmaker/docmaker.py b/components/gui/libraries/freetype/src/tools/docmaker/docmaker.py similarity index 100% rename from components/external/freetype/src/tools/docmaker/docmaker.py rename to components/gui/libraries/freetype/src/tools/docmaker/docmaker.py diff --git a/components/external/freetype/src/tools/docmaker/formatter.py b/components/gui/libraries/freetype/src/tools/docmaker/formatter.py similarity index 100% rename from components/external/freetype/src/tools/docmaker/formatter.py rename to components/gui/libraries/freetype/src/tools/docmaker/formatter.py diff --git a/components/external/freetype/src/tools/docmaker/sources.py b/components/gui/libraries/freetype/src/tools/docmaker/sources.py similarity index 100% rename from components/external/freetype/src/tools/docmaker/sources.py rename to components/gui/libraries/freetype/src/tools/docmaker/sources.py diff --git a/components/external/freetype/src/tools/docmaker/tohtml.py b/components/gui/libraries/freetype/src/tools/docmaker/tohtml.py similarity index 100% rename from components/external/freetype/src/tools/docmaker/tohtml.py rename to components/gui/libraries/freetype/src/tools/docmaker/tohtml.py diff --git a/components/external/freetype/src/tools/docmaker/utils.py b/components/gui/libraries/freetype/src/tools/docmaker/utils.py similarity index 100% rename from components/external/freetype/src/tools/docmaker/utils.py rename to components/gui/libraries/freetype/src/tools/docmaker/utils.py diff --git a/components/external/freetype/src/tools/ftrandom/Makefile b/components/gui/libraries/freetype/src/tools/ftrandom/Makefile similarity index 100% rename from components/external/freetype/src/tools/ftrandom/Makefile rename to components/gui/libraries/freetype/src/tools/ftrandom/Makefile diff --git a/components/external/freetype/src/tools/ftrandom/README b/components/gui/libraries/freetype/src/tools/ftrandom/README similarity index 100% rename from components/external/freetype/src/tools/ftrandom/README rename to components/gui/libraries/freetype/src/tools/ftrandom/README diff --git a/components/external/freetype/src/tools/ftrandom/ftrandom.c b/components/gui/libraries/freetype/src/tools/ftrandom/ftrandom.c similarity index 100% rename from components/external/freetype/src/tools/ftrandom/ftrandom.c rename to components/gui/libraries/freetype/src/tools/ftrandom/ftrandom.c diff --git a/components/external/freetype/src/tools/glnames.py b/components/gui/libraries/freetype/src/tools/glnames.py similarity index 100% rename from components/external/freetype/src/tools/glnames.py rename to components/gui/libraries/freetype/src/tools/glnames.py diff --git a/components/external/freetype/src/tools/test_afm.c b/components/gui/libraries/freetype/src/tools/test_afm.c similarity index 100% rename from components/external/freetype/src/tools/test_afm.c rename to components/gui/libraries/freetype/src/tools/test_afm.c diff --git a/components/external/freetype/src/tools/test_bbox.c b/components/gui/libraries/freetype/src/tools/test_bbox.c similarity index 100% rename from components/external/freetype/src/tools/test_bbox.c rename to components/gui/libraries/freetype/src/tools/test_bbox.c diff --git a/components/external/freetype/src/tools/test_trig.c b/components/gui/libraries/freetype/src/tools/test_trig.c similarity index 100% rename from components/external/freetype/src/tools/test_trig.c rename to components/gui/libraries/freetype/src/tools/test_trig.c diff --git a/components/external/freetype/src/truetype/Jamfile b/components/gui/libraries/freetype/src/truetype/Jamfile similarity index 100% rename from components/external/freetype/src/truetype/Jamfile rename to components/gui/libraries/freetype/src/truetype/Jamfile diff --git a/components/external/freetype/src/truetype/module.mk b/components/gui/libraries/freetype/src/truetype/module.mk similarity index 100% rename from components/external/freetype/src/truetype/module.mk rename to components/gui/libraries/freetype/src/truetype/module.mk diff --git a/components/external/freetype/src/truetype/rules.mk b/components/gui/libraries/freetype/src/truetype/rules.mk similarity index 100% rename from components/external/freetype/src/truetype/rules.mk rename to components/gui/libraries/freetype/src/truetype/rules.mk diff --git a/components/external/freetype/src/truetype/truetype.c b/components/gui/libraries/freetype/src/truetype/truetype.c similarity index 100% rename from components/external/freetype/src/truetype/truetype.c rename to components/gui/libraries/freetype/src/truetype/truetype.c diff --git a/components/external/freetype/src/truetype/ttdriver.c b/components/gui/libraries/freetype/src/truetype/ttdriver.c similarity index 100% rename from components/external/freetype/src/truetype/ttdriver.c rename to components/gui/libraries/freetype/src/truetype/ttdriver.c diff --git a/components/external/freetype/src/truetype/ttdriver.h b/components/gui/libraries/freetype/src/truetype/ttdriver.h similarity index 100% rename from components/external/freetype/src/truetype/ttdriver.h rename to components/gui/libraries/freetype/src/truetype/ttdriver.h diff --git a/components/external/freetype/src/truetype/tterrors.h b/components/gui/libraries/freetype/src/truetype/tterrors.h similarity index 100% rename from components/external/freetype/src/truetype/tterrors.h rename to components/gui/libraries/freetype/src/truetype/tterrors.h diff --git a/components/external/freetype/src/truetype/ttgload.c b/components/gui/libraries/freetype/src/truetype/ttgload.c similarity index 100% rename from components/external/freetype/src/truetype/ttgload.c rename to components/gui/libraries/freetype/src/truetype/ttgload.c diff --git a/components/external/freetype/src/truetype/ttgload.h b/components/gui/libraries/freetype/src/truetype/ttgload.h similarity index 100% rename from components/external/freetype/src/truetype/ttgload.h rename to components/gui/libraries/freetype/src/truetype/ttgload.h diff --git a/components/external/freetype/src/truetype/ttgxvar.c b/components/gui/libraries/freetype/src/truetype/ttgxvar.c similarity index 100% rename from components/external/freetype/src/truetype/ttgxvar.c rename to components/gui/libraries/freetype/src/truetype/ttgxvar.c diff --git a/components/external/freetype/src/truetype/ttgxvar.h b/components/gui/libraries/freetype/src/truetype/ttgxvar.h similarity index 100% rename from components/external/freetype/src/truetype/ttgxvar.h rename to components/gui/libraries/freetype/src/truetype/ttgxvar.h diff --git a/components/external/freetype/src/truetype/ttinterp.c b/components/gui/libraries/freetype/src/truetype/ttinterp.c similarity index 100% rename from components/external/freetype/src/truetype/ttinterp.c rename to components/gui/libraries/freetype/src/truetype/ttinterp.c diff --git a/components/external/freetype/src/truetype/ttinterp.h b/components/gui/libraries/freetype/src/truetype/ttinterp.h similarity index 100% rename from components/external/freetype/src/truetype/ttinterp.h rename to components/gui/libraries/freetype/src/truetype/ttinterp.h diff --git a/components/external/freetype/src/truetype/ttobjs.c b/components/gui/libraries/freetype/src/truetype/ttobjs.c similarity index 100% rename from components/external/freetype/src/truetype/ttobjs.c rename to components/gui/libraries/freetype/src/truetype/ttobjs.c diff --git a/components/external/freetype/src/truetype/ttobjs.h b/components/gui/libraries/freetype/src/truetype/ttobjs.h similarity index 100% rename from components/external/freetype/src/truetype/ttobjs.h rename to components/gui/libraries/freetype/src/truetype/ttobjs.h diff --git a/components/external/freetype/src/truetype/ttpic.c b/components/gui/libraries/freetype/src/truetype/ttpic.c similarity index 100% rename from components/external/freetype/src/truetype/ttpic.c rename to components/gui/libraries/freetype/src/truetype/ttpic.c diff --git a/components/external/freetype/src/truetype/ttpic.h b/components/gui/libraries/freetype/src/truetype/ttpic.h similarity index 100% rename from components/external/freetype/src/truetype/ttpic.h rename to components/gui/libraries/freetype/src/truetype/ttpic.h diff --git a/components/external/freetype/src/truetype/ttpload.c b/components/gui/libraries/freetype/src/truetype/ttpload.c similarity index 100% rename from components/external/freetype/src/truetype/ttpload.c rename to components/gui/libraries/freetype/src/truetype/ttpload.c diff --git a/components/external/freetype/src/truetype/ttpload.h b/components/gui/libraries/freetype/src/truetype/ttpload.h similarity index 100% rename from components/external/freetype/src/truetype/ttpload.h rename to components/gui/libraries/freetype/src/truetype/ttpload.h diff --git a/components/external/freetype/src/truetype/ttsubpix.c b/components/gui/libraries/freetype/src/truetype/ttsubpix.c similarity index 100% rename from components/external/freetype/src/truetype/ttsubpix.c rename to components/gui/libraries/freetype/src/truetype/ttsubpix.c diff --git a/components/external/freetype/src/truetype/ttsubpix.h b/components/gui/libraries/freetype/src/truetype/ttsubpix.h similarity index 100% rename from components/external/freetype/src/truetype/ttsubpix.h rename to components/gui/libraries/freetype/src/truetype/ttsubpix.h diff --git a/components/external/freetype/src/type1/Jamfile b/components/gui/libraries/freetype/src/type1/Jamfile similarity index 100% rename from components/external/freetype/src/type1/Jamfile rename to components/gui/libraries/freetype/src/type1/Jamfile diff --git a/components/external/freetype/src/type1/module.mk b/components/gui/libraries/freetype/src/type1/module.mk similarity index 100% rename from components/external/freetype/src/type1/module.mk rename to components/gui/libraries/freetype/src/type1/module.mk diff --git a/components/external/freetype/src/type1/rules.mk b/components/gui/libraries/freetype/src/type1/rules.mk similarity index 100% rename from components/external/freetype/src/type1/rules.mk rename to components/gui/libraries/freetype/src/type1/rules.mk diff --git a/components/external/freetype/src/type1/t1afm.c b/components/gui/libraries/freetype/src/type1/t1afm.c similarity index 100% rename from components/external/freetype/src/type1/t1afm.c rename to components/gui/libraries/freetype/src/type1/t1afm.c diff --git a/components/external/freetype/src/type1/t1afm.h b/components/gui/libraries/freetype/src/type1/t1afm.h similarity index 100% rename from components/external/freetype/src/type1/t1afm.h rename to components/gui/libraries/freetype/src/type1/t1afm.h diff --git a/components/external/freetype/src/type1/t1driver.c b/components/gui/libraries/freetype/src/type1/t1driver.c similarity index 100% rename from components/external/freetype/src/type1/t1driver.c rename to components/gui/libraries/freetype/src/type1/t1driver.c diff --git a/components/external/freetype/src/type1/t1driver.h b/components/gui/libraries/freetype/src/type1/t1driver.h similarity index 100% rename from components/external/freetype/src/type1/t1driver.h rename to components/gui/libraries/freetype/src/type1/t1driver.h diff --git a/components/external/freetype/src/type1/t1errors.h b/components/gui/libraries/freetype/src/type1/t1errors.h similarity index 100% rename from components/external/freetype/src/type1/t1errors.h rename to components/gui/libraries/freetype/src/type1/t1errors.h diff --git a/components/external/freetype/src/type1/t1gload.c b/components/gui/libraries/freetype/src/type1/t1gload.c similarity index 100% rename from components/external/freetype/src/type1/t1gload.c rename to components/gui/libraries/freetype/src/type1/t1gload.c diff --git a/components/external/freetype/src/type1/t1gload.h b/components/gui/libraries/freetype/src/type1/t1gload.h similarity index 100% rename from components/external/freetype/src/type1/t1gload.h rename to components/gui/libraries/freetype/src/type1/t1gload.h diff --git a/components/external/freetype/src/type1/t1load.c b/components/gui/libraries/freetype/src/type1/t1load.c similarity index 100% rename from components/external/freetype/src/type1/t1load.c rename to components/gui/libraries/freetype/src/type1/t1load.c diff --git a/components/external/freetype/src/type1/t1load.h b/components/gui/libraries/freetype/src/type1/t1load.h similarity index 100% rename from components/external/freetype/src/type1/t1load.h rename to components/gui/libraries/freetype/src/type1/t1load.h diff --git a/components/external/freetype/src/type1/t1objs.c b/components/gui/libraries/freetype/src/type1/t1objs.c similarity index 100% rename from components/external/freetype/src/type1/t1objs.c rename to components/gui/libraries/freetype/src/type1/t1objs.c diff --git a/components/external/freetype/src/type1/t1objs.h b/components/gui/libraries/freetype/src/type1/t1objs.h similarity index 100% rename from components/external/freetype/src/type1/t1objs.h rename to components/gui/libraries/freetype/src/type1/t1objs.h diff --git a/components/external/freetype/src/type1/t1parse.c b/components/gui/libraries/freetype/src/type1/t1parse.c similarity index 100% rename from components/external/freetype/src/type1/t1parse.c rename to components/gui/libraries/freetype/src/type1/t1parse.c diff --git a/components/external/freetype/src/type1/t1parse.h b/components/gui/libraries/freetype/src/type1/t1parse.h similarity index 100% rename from components/external/freetype/src/type1/t1parse.h rename to components/gui/libraries/freetype/src/type1/t1parse.h diff --git a/components/external/freetype/src/type1/t1tokens.h b/components/gui/libraries/freetype/src/type1/t1tokens.h similarity index 100% rename from components/external/freetype/src/type1/t1tokens.h rename to components/gui/libraries/freetype/src/type1/t1tokens.h diff --git a/components/external/freetype/src/type1/type1.c b/components/gui/libraries/freetype/src/type1/type1.c similarity index 100% rename from components/external/freetype/src/type1/type1.c rename to components/gui/libraries/freetype/src/type1/type1.c diff --git a/components/external/freetype/src/type42/Jamfile b/components/gui/libraries/freetype/src/type42/Jamfile similarity index 100% rename from components/external/freetype/src/type42/Jamfile rename to components/gui/libraries/freetype/src/type42/Jamfile diff --git a/components/external/freetype/src/type42/module.mk b/components/gui/libraries/freetype/src/type42/module.mk similarity index 100% rename from components/external/freetype/src/type42/module.mk rename to components/gui/libraries/freetype/src/type42/module.mk diff --git a/components/external/freetype/src/type42/rules.mk b/components/gui/libraries/freetype/src/type42/rules.mk similarity index 100% rename from components/external/freetype/src/type42/rules.mk rename to components/gui/libraries/freetype/src/type42/rules.mk diff --git a/components/external/freetype/src/type42/t42drivr.c b/components/gui/libraries/freetype/src/type42/t42drivr.c similarity index 100% rename from components/external/freetype/src/type42/t42drivr.c rename to components/gui/libraries/freetype/src/type42/t42drivr.c diff --git a/components/external/freetype/src/type42/t42drivr.h b/components/gui/libraries/freetype/src/type42/t42drivr.h similarity index 100% rename from components/external/freetype/src/type42/t42drivr.h rename to components/gui/libraries/freetype/src/type42/t42drivr.h diff --git a/components/external/freetype/src/type42/t42error.h b/components/gui/libraries/freetype/src/type42/t42error.h similarity index 100% rename from components/external/freetype/src/type42/t42error.h rename to components/gui/libraries/freetype/src/type42/t42error.h diff --git a/components/external/freetype/src/type42/t42objs.c b/components/gui/libraries/freetype/src/type42/t42objs.c similarity index 100% rename from components/external/freetype/src/type42/t42objs.c rename to components/gui/libraries/freetype/src/type42/t42objs.c diff --git a/components/external/freetype/src/type42/t42objs.h b/components/gui/libraries/freetype/src/type42/t42objs.h similarity index 100% rename from components/external/freetype/src/type42/t42objs.h rename to components/gui/libraries/freetype/src/type42/t42objs.h diff --git a/components/external/freetype/src/type42/t42parse.c b/components/gui/libraries/freetype/src/type42/t42parse.c similarity index 100% rename from components/external/freetype/src/type42/t42parse.c rename to components/gui/libraries/freetype/src/type42/t42parse.c diff --git a/components/external/freetype/src/type42/t42parse.h b/components/gui/libraries/freetype/src/type42/t42parse.h similarity index 100% rename from components/external/freetype/src/type42/t42parse.h rename to components/gui/libraries/freetype/src/type42/t42parse.h diff --git a/components/external/freetype/src/type42/t42types.h b/components/gui/libraries/freetype/src/type42/t42types.h similarity index 100% rename from components/external/freetype/src/type42/t42types.h rename to components/gui/libraries/freetype/src/type42/t42types.h diff --git a/components/external/freetype/src/type42/type42.c b/components/gui/libraries/freetype/src/type42/type42.c similarity index 100% rename from components/external/freetype/src/type42/type42.c rename to components/gui/libraries/freetype/src/type42/type42.c diff --git a/components/external/freetype/src/winfonts/Jamfile b/components/gui/libraries/freetype/src/winfonts/Jamfile similarity index 100% rename from components/external/freetype/src/winfonts/Jamfile rename to components/gui/libraries/freetype/src/winfonts/Jamfile diff --git a/components/external/freetype/src/winfonts/fnterrs.h b/components/gui/libraries/freetype/src/winfonts/fnterrs.h similarity index 100% rename from components/external/freetype/src/winfonts/fnterrs.h rename to components/gui/libraries/freetype/src/winfonts/fnterrs.h diff --git a/components/external/freetype/src/winfonts/module.mk b/components/gui/libraries/freetype/src/winfonts/module.mk similarity index 100% rename from components/external/freetype/src/winfonts/module.mk rename to components/gui/libraries/freetype/src/winfonts/module.mk diff --git a/components/external/freetype/src/winfonts/rules.mk b/components/gui/libraries/freetype/src/winfonts/rules.mk similarity index 100% rename from components/external/freetype/src/winfonts/rules.mk rename to components/gui/libraries/freetype/src/winfonts/rules.mk diff --git a/components/external/freetype/src/winfonts/winfnt.c b/components/gui/libraries/freetype/src/winfonts/winfnt.c similarity index 100% rename from components/external/freetype/src/winfonts/winfnt.c rename to components/gui/libraries/freetype/src/winfonts/winfnt.c diff --git a/components/external/freetype/src/winfonts/winfnt.h b/components/gui/libraries/freetype/src/winfonts/winfnt.h similarity index 100% rename from components/external/freetype/src/winfonts/winfnt.h rename to components/gui/libraries/freetype/src/winfonts/winfnt.h diff --git a/components/external/freetype/version.sed b/components/gui/libraries/freetype/version.sed similarity index 100% rename from components/external/freetype/version.sed rename to components/gui/libraries/freetype/version.sed diff --git a/components/external/freetype/vms_make.com b/components/gui/libraries/freetype/vms_make.com similarity index 100% rename from components/external/freetype/vms_make.com rename to components/gui/libraries/freetype/vms_make.com diff --git a/components/external/lodepng/SConscript b/components/gui/libraries/lodepng/SConscript similarity index 100% rename from components/external/lodepng/SConscript rename to components/gui/libraries/lodepng/SConscript diff --git a/components/external/lodepng/lodepng.c b/components/gui/libraries/lodepng/lodepng.c similarity index 100% rename from components/external/lodepng/lodepng.c rename to components/gui/libraries/lodepng/lodepng.c diff --git a/components/external/lodepng/lodepng.h b/components/gui/libraries/lodepng/lodepng.h similarity index 100% rename from components/external/lodepng/lodepng.h rename to components/gui/libraries/lodepng/lodepng.h diff --git a/components/external/tjpgd1a/SConscript b/components/gui/libraries/tjpgd1a/SConscript similarity index 100% rename from components/external/tjpgd1a/SConscript rename to components/gui/libraries/tjpgd1a/SConscript diff --git a/components/external/tjpgd1a/aa_idct.png b/components/gui/libraries/tjpgd1a/aa_idct.png similarity index 100% rename from components/external/tjpgd1a/aa_idct.png rename to components/gui/libraries/tjpgd1a/aa_idct.png diff --git a/components/external/tjpgd1a/integer.h b/components/gui/libraries/tjpgd1a/integer.h similarity index 100% rename from components/external/tjpgd1a/integer.h rename to components/gui/libraries/tjpgd1a/integer.h diff --git a/components/external/tjpgd1a/tjpgd.c b/components/gui/libraries/tjpgd1a/tjpgd.c similarity index 100% rename from components/external/tjpgd1a/tjpgd.c rename to components/gui/libraries/tjpgd1a/tjpgd.c diff --git a/components/external/tjpgd1a/tjpgd.h b/components/gui/libraries/tjpgd1a/tjpgd.h similarity index 100% rename from components/external/tjpgd1a/tjpgd.h rename to components/gui/libraries/tjpgd1a/tjpgd.h diff --git a/include/rtdef.h b/include/rtdef.h index 913c8105cf3263338fa2ecee45951939d21d13b8..77c302dffac4a58ad42a0ec068a49e6d929270d5 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -895,6 +895,7 @@ enum RTGRAPHIC_PIXEL_FORMAT_RGB888, RTGRAPHIC_PIXEL_FORMAT_ARGB888, RTGRAPHIC_PIXEL_FORMAT_ABGR888, + RTGRAPHIC_PIXEL_FORMAT_ARGB565, RTGRAPHIC_PIXEL_FORMAT_ALPHA, };