diff --git a/harbour/.gitattributes b/.gitattributes similarity index 100% rename from harbour/.gitattributes rename to .gitattributes diff --git a/harbour/.gitignore b/.gitignore similarity index 100% rename from harbour/.gitignore rename to .gitignore diff --git a/harbour/COPYING.txt b/COPYING.txt similarity index 100% rename from harbour/COPYING.txt rename to COPYING.txt diff --git a/harbour/ChangeLog.txt b/ChangeLog.txt similarity index 99% rename from harbour/ChangeLog.txt rename to ChangeLog.txt index e3910ca859..d746348f93 100644 --- a/harbour/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,11 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-15 11:12 UTC+0100 Viktor Szakats (harbour syenar.net) + * /harbour/* -> /* + * moved whole Harbour source tree one level up to + avoid single 'harbour' top dir + 2013-03-15 11:02 UTC+0100 Viktor Szakats (harbour syenar.net) * .gitattributes + enabled keyword expansion for ChangeLog.txt diff --git a/harbour/Makefile b/Makefile similarity index 100% rename from harbour/Makefile rename to Makefile diff --git a/harbour/README.txt b/README.txt similarity index 100% rename from harbour/README.txt rename to README.txt diff --git a/harbour/bin/3rdpatch.hb b/bin/3rdpatch.hb similarity index 100% rename from harbour/bin/3rdpatch.hb rename to bin/3rdpatch.hb diff --git a/harbour/bin/commit.hb b/bin/commit.hb similarity index 100% rename from harbour/bin/commit.hb rename to bin/commit.hb diff --git a/harbour/bin/harbour.ucf b/bin/harbour.ucf similarity index 100% rename from harbour/bin/harbour.ucf rename to bin/harbour.ucf diff --git a/harbour/config/aix/gcc.mk b/config/aix/gcc.mk similarity index 100% rename from harbour/config/aix/gcc.mk rename to config/aix/gcc.mk diff --git a/harbour/config/aix/global.mk b/config/aix/global.mk similarity index 100% rename from harbour/config/aix/global.mk rename to config/aix/global.mk diff --git a/harbour/config/aix/libs.mk b/config/aix/libs.mk similarity index 100% rename from harbour/config/aix/libs.mk rename to config/aix/libs.mk diff --git a/harbour/config/android/gcc.mk b/config/android/gcc.mk similarity index 100% rename from harbour/config/android/gcc.mk rename to config/android/gcc.mk diff --git a/harbour/config/android/gccarm.mk b/config/android/gccarm.mk similarity index 100% rename from harbour/config/android/gccarm.mk rename to config/android/gccarm.mk diff --git a/harbour/config/android/global.mk b/config/android/global.mk similarity index 100% rename from harbour/config/android/global.mk rename to config/android/global.mk diff --git a/harbour/config/android/libs.mk b/config/android/libs.mk similarity index 100% rename from harbour/config/android/libs.mk rename to config/android/libs.mk diff --git a/harbour/config/beos/gcc.mk b/config/beos/gcc.mk similarity index 100% rename from harbour/config/beos/gcc.mk rename to config/beos/gcc.mk diff --git a/harbour/config/beos/global.mk b/config/beos/global.mk similarity index 100% rename from harbour/config/beos/global.mk rename to config/beos/global.mk diff --git a/harbour/config/beos/libs.mk b/config/beos/libs.mk similarity index 100% rename from harbour/config/beos/libs.mk rename to config/beos/libs.mk diff --git a/harbour/config/bin.mk b/config/bin.mk similarity index 100% rename from harbour/config/bin.mk rename to config/bin.mk diff --git a/harbour/config/bsd/clang.mk b/config/bsd/clang.mk similarity index 100% rename from harbour/config/bsd/clang.mk rename to config/bsd/clang.mk diff --git a/harbour/config/bsd/gcc.mk b/config/bsd/gcc.mk similarity index 100% rename from harbour/config/bsd/gcc.mk rename to config/bsd/gcc.mk diff --git a/harbour/config/bsd/global.mk b/config/bsd/global.mk similarity index 100% rename from harbour/config/bsd/global.mk rename to config/bsd/global.mk diff --git a/harbour/config/bsd/libs.mk b/config/bsd/libs.mk similarity index 100% rename from harbour/config/bsd/libs.mk rename to config/bsd/libs.mk diff --git a/harbour/config/bsd/pcc.mk b/config/bsd/pcc.mk similarity index 100% rename from harbour/config/bsd/pcc.mk rename to config/bsd/pcc.mk diff --git a/harbour/config/c.mk b/config/c.mk similarity index 100% rename from harbour/config/c.mk rename to config/c.mk diff --git a/harbour/config/common/watcom.mk b/config/common/watcom.mk similarity index 100% rename from harbour/config/common/watcom.mk rename to config/common/watcom.mk diff --git a/harbour/config/cygwin/gcc.mk b/config/cygwin/gcc.mk similarity index 100% rename from harbour/config/cygwin/gcc.mk rename to config/cygwin/gcc.mk diff --git a/harbour/config/cygwin/global.mk b/config/cygwin/global.mk similarity index 100% rename from harbour/config/cygwin/global.mk rename to config/cygwin/global.mk diff --git a/harbour/config/cygwin/libs.mk b/config/cygwin/libs.mk similarity index 100% rename from harbour/config/cygwin/libs.mk rename to config/cygwin/libs.mk diff --git a/harbour/config/darwin/clang.mk b/config/darwin/clang.mk similarity index 100% rename from harbour/config/darwin/clang.mk rename to config/darwin/clang.mk diff --git a/harbour/config/darwin/gcc.mk b/config/darwin/gcc.mk similarity index 100% rename from harbour/config/darwin/gcc.mk rename to config/darwin/gcc.mk diff --git a/harbour/config/darwin/global.mk b/config/darwin/global.mk similarity index 100% rename from harbour/config/darwin/global.mk rename to config/darwin/global.mk diff --git a/harbour/config/darwin/icc.mk b/config/darwin/icc.mk similarity index 100% rename from harbour/config/darwin/icc.mk rename to config/darwin/icc.mk diff --git a/harbour/config/darwin/libs.mk b/config/darwin/libs.mk similarity index 100% rename from harbour/config/darwin/libs.mk rename to config/darwin/libs.mk diff --git a/harbour/config/detect.mk b/config/detect.mk similarity index 100% rename from harbour/config/detect.mk rename to config/detect.mk diff --git a/harbour/config/detfun.mk b/config/detfun.mk similarity index 100% rename from harbour/config/detfun.mk rename to config/detfun.mk diff --git a/harbour/config/detplat.mk b/config/detplat.mk similarity index 100% rename from harbour/config/detplat.mk rename to config/detplat.mk diff --git a/harbour/config/dir.mk b/config/dir.mk similarity index 100% rename from harbour/config/dir.mk rename to config/dir.mk diff --git a/harbour/config/dirsh.mk b/config/dirsh.mk similarity index 100% rename from harbour/config/dirsh.mk rename to config/dirsh.mk diff --git a/harbour/config/doc.mk b/config/doc.mk similarity index 100% rename from harbour/config/doc.mk rename to config/doc.mk diff --git a/harbour/config/dos/djgpp.mk b/config/dos/djgpp.mk similarity index 100% rename from harbour/config/dos/djgpp.mk rename to config/dos/djgpp.mk diff --git a/harbour/config/dos/global.mk b/config/dos/global.mk similarity index 100% rename from harbour/config/dos/global.mk rename to config/dos/global.mk diff --git a/harbour/config/dos/watcom.mk b/config/dos/watcom.mk similarity index 100% rename from harbour/config/dos/watcom.mk rename to config/dos/watcom.mk diff --git a/harbour/config/doscp.exe b/config/doscp.exe similarity index 100% rename from harbour/config/doscp.exe rename to config/doscp.exe diff --git a/harbour/config/dosecho.exe b/config/dosecho.exe similarity index 100% rename from harbour/config/dosecho.exe rename to config/dosecho.exe diff --git a/harbour/config/dosmkdir.exe b/config/dosmkdir.exe similarity index 100% rename from harbour/config/dosmkdir.exe rename to config/dosmkdir.exe diff --git a/harbour/config/dosrm.exe b/config/dosrm.exe similarity index 100% rename from harbour/config/dosrm.exe rename to config/dosrm.exe diff --git a/harbour/config/dyn.mk b/config/dyn.mk similarity index 100% rename from harbour/config/dyn.mk rename to config/dyn.mk diff --git a/harbour/config/global.mk b/config/global.mk similarity index 100% rename from harbour/config/global.mk rename to config/global.mk diff --git a/harbour/config/globsh.mk b/config/globsh.mk similarity index 100% rename from harbour/config/globsh.mk rename to config/globsh.mk diff --git a/harbour/config/header.mk b/config/header.mk similarity index 100% rename from harbour/config/header.mk rename to config/header.mk diff --git a/harbour/config/hpux/gcc.mk b/config/hpux/gcc.mk similarity index 100% rename from harbour/config/hpux/gcc.mk rename to config/hpux/gcc.mk diff --git a/harbour/config/hpux/global.mk b/config/hpux/global.mk similarity index 100% rename from harbour/config/hpux/global.mk rename to config/hpux/global.mk diff --git a/harbour/config/hpux/libs.mk b/config/hpux/libs.mk similarity index 100% rename from harbour/config/hpux/libs.mk rename to config/hpux/libs.mk diff --git a/harbour/config/install.mk b/config/install.mk similarity index 100% rename from harbour/config/install.mk rename to config/install.mk diff --git a/harbour/config/instsh.mk b/config/instsh.mk similarity index 100% rename from harbour/config/instsh.mk rename to config/instsh.mk diff --git a/harbour/config/lib.mk b/config/lib.mk similarity index 100% rename from harbour/config/lib.mk rename to config/lib.mk diff --git a/harbour/config/libbin.mk b/config/libbin.mk similarity index 100% rename from harbour/config/libbin.mk rename to config/libbin.mk diff --git a/harbour/config/linux/clang.mk b/config/linux/clang.mk similarity index 100% rename from harbour/config/linux/clang.mk rename to config/linux/clang.mk diff --git a/harbour/config/linux/gcc.mk b/config/linux/gcc.mk similarity index 100% rename from harbour/config/linux/gcc.mk rename to config/linux/gcc.mk diff --git a/harbour/config/linux/global.mk b/config/linux/global.mk similarity index 100% rename from harbour/config/linux/global.mk rename to config/linux/global.mk diff --git a/harbour/config/linux/icc.mk b/config/linux/icc.mk similarity index 100% rename from harbour/config/linux/icc.mk rename to config/linux/icc.mk diff --git a/harbour/config/linux/libs.mk b/config/linux/libs.mk similarity index 100% rename from harbour/config/linux/libs.mk rename to config/linux/libs.mk diff --git a/harbour/config/linux/open64.mk b/config/linux/open64.mk similarity index 100% rename from harbour/config/linux/open64.mk rename to config/linux/open64.mk diff --git a/harbour/config/linux/sunpro.mk b/config/linux/sunpro.mk similarity index 100% rename from harbour/config/linux/sunpro.mk rename to config/linux/sunpro.mk diff --git a/harbour/config/linux/watcom.mk b/config/linux/watcom.mk similarity index 100% rename from harbour/config/linux/watcom.mk rename to config/linux/watcom.mk diff --git a/harbour/config/minix/clang.mk b/config/minix/clang.mk similarity index 100% rename from harbour/config/minix/clang.mk rename to config/minix/clang.mk diff --git a/harbour/config/minix/gcc.mk b/config/minix/gcc.mk similarity index 100% rename from harbour/config/minix/gcc.mk rename to config/minix/gcc.mk diff --git a/harbour/config/minix/global.mk b/config/minix/global.mk similarity index 100% rename from harbour/config/minix/global.mk rename to config/minix/global.mk diff --git a/harbour/config/minix/libs.mk b/config/minix/libs.mk similarity index 100% rename from harbour/config/minix/libs.mk rename to config/minix/libs.mk diff --git a/harbour/config/none.mk b/config/none.mk similarity index 100% rename from harbour/config/none.mk rename to config/none.mk diff --git a/harbour/config/os2/gcc.mk b/config/os2/gcc.mk similarity index 100% rename from harbour/config/os2/gcc.mk rename to config/os2/gcc.mk diff --git a/harbour/config/os2/gccomf.mk b/config/os2/gccomf.mk similarity index 100% rename from harbour/config/os2/gccomf.mk rename to config/os2/gccomf.mk diff --git a/harbour/config/os2/global.mk b/config/os2/global.mk similarity index 100% rename from harbour/config/os2/global.mk rename to config/os2/global.mk diff --git a/harbour/config/os2/watcom.mk b/config/os2/watcom.mk similarity index 100% rename from harbour/config/os2/watcom.mk rename to config/os2/watcom.mk diff --git a/harbour/config/os2cp.exe b/config/os2cp.exe similarity index 100% rename from harbour/config/os2cp.exe rename to config/os2cp.exe diff --git a/harbour/config/os2mkdir.exe b/config/os2mkdir.exe similarity index 100% rename from harbour/config/os2mkdir.exe rename to config/os2mkdir.exe diff --git a/harbour/config/os2rm.exe b/config/os2rm.exe similarity index 100% rename from harbour/config/os2rm.exe rename to config/os2rm.exe diff --git a/harbour/config/postinst.hb b/config/postinst.hb similarity index 100% rename from harbour/config/postinst.hb rename to config/postinst.hb diff --git a/harbour/config/prg.mk b/config/prg.mk similarity index 100% rename from harbour/config/prg.mk rename to config/prg.mk diff --git a/harbour/config/qnx/gcc.mk b/config/qnx/gcc.mk similarity index 100% rename from harbour/config/qnx/gcc.mk rename to config/qnx/gcc.mk diff --git a/harbour/config/qnx/global.mk b/config/qnx/global.mk similarity index 100% rename from harbour/config/qnx/global.mk rename to config/qnx/global.mk diff --git a/harbour/config/qnx/libs.mk b/config/qnx/libs.mk similarity index 100% rename from harbour/config/qnx/libs.mk rename to config/qnx/libs.mk diff --git a/harbour/config/res.mk b/config/res.mk similarity index 100% rename from harbour/config/res.mk rename to config/res.mk diff --git a/harbour/config/rules.mk b/config/rules.mk similarity index 100% rename from harbour/config/rules.mk rename to config/rules.mk diff --git a/harbour/config/sunos/gcc.mk b/config/sunos/gcc.mk similarity index 100% rename from harbour/config/sunos/gcc.mk rename to config/sunos/gcc.mk diff --git a/harbour/config/sunos/global.mk b/config/sunos/global.mk similarity index 100% rename from harbour/config/sunos/global.mk rename to config/sunos/global.mk diff --git a/harbour/config/sunos/libs.mk b/config/sunos/libs.mk similarity index 100% rename from harbour/config/sunos/libs.mk rename to config/sunos/libs.mk diff --git a/harbour/config/sunos/sunpro.mk b/config/sunos/sunpro.mk similarity index 100% rename from harbour/config/sunos/sunpro.mk rename to config/sunos/sunpro.mk diff --git a/harbour/config/symbian/gcc.mk b/config/symbian/gcc.mk similarity index 100% rename from harbour/config/symbian/gcc.mk rename to config/symbian/gcc.mk diff --git a/harbour/config/symbian/global.mk b/config/symbian/global.mk similarity index 100% rename from harbour/config/symbian/global.mk rename to config/symbian/global.mk diff --git a/harbour/config/symbian/libs.mk b/config/symbian/libs.mk similarity index 100% rename from harbour/config/symbian/libs.mk rename to config/symbian/libs.mk diff --git a/harbour/config/vxworks/diab.mk b/config/vxworks/diab.mk similarity index 100% rename from harbour/config/vxworks/diab.mk rename to config/vxworks/diab.mk diff --git a/harbour/config/vxworks/gcc.mk b/config/vxworks/gcc.mk similarity index 100% rename from harbour/config/vxworks/gcc.mk rename to config/vxworks/gcc.mk diff --git a/harbour/config/vxworks/global.mk b/config/vxworks/global.mk similarity index 100% rename from harbour/config/vxworks/global.mk rename to config/vxworks/global.mk diff --git a/harbour/config/vxworks/libs.mk b/config/vxworks/libs.mk similarity index 100% rename from harbour/config/vxworks/libs.mk rename to config/vxworks/libs.mk diff --git a/harbour/config/wce/global.mk b/config/wce/global.mk similarity index 100% rename from harbour/config/wce/global.mk rename to config/wce/global.mk diff --git a/harbour/config/wce/mingw.mk b/config/wce/mingw.mk similarity index 100% rename from harbour/config/wce/mingw.mk rename to config/wce/mingw.mk diff --git a/harbour/config/wce/mingwarm.mk b/config/wce/mingwarm.mk similarity index 100% rename from harbour/config/wce/mingwarm.mk rename to config/wce/mingwarm.mk diff --git a/harbour/config/wce/msvcarm.mk b/config/wce/msvcarm.mk similarity index 100% rename from harbour/config/wce/msvcarm.mk rename to config/wce/msvcarm.mk diff --git a/harbour/config/wce/poccarm.mk b/config/wce/poccarm.mk similarity index 100% rename from harbour/config/wce/poccarm.mk rename to config/wce/poccarm.mk diff --git a/harbour/config/win/bcc.mk b/config/win/bcc.mk similarity index 100% rename from harbour/config/win/bcc.mk rename to config/win/bcc.mk diff --git a/harbour/config/win/bcc64.mk b/config/win/bcc64.mk similarity index 100% rename from harbour/config/win/bcc64.mk rename to config/win/bcc64.mk diff --git a/harbour/config/win/clang.mk b/config/win/clang.mk similarity index 100% rename from harbour/config/win/clang.mk rename to config/win/clang.mk diff --git a/harbour/config/win/gcc.mk b/config/win/gcc.mk similarity index 100% rename from harbour/config/win/gcc.mk rename to config/win/gcc.mk diff --git a/harbour/config/win/global.mk b/config/win/global.mk similarity index 100% rename from harbour/config/win/global.mk rename to config/win/global.mk diff --git a/harbour/config/win/icc.mk b/config/win/icc.mk similarity index 100% rename from harbour/config/win/icc.mk rename to config/win/icc.mk diff --git a/harbour/config/win/iccia64.mk b/config/win/iccia64.mk similarity index 100% rename from harbour/config/win/iccia64.mk rename to config/win/iccia64.mk diff --git a/harbour/config/win/mingw.mk b/config/win/mingw.mk similarity index 100% rename from harbour/config/win/mingw.mk rename to config/win/mingw.mk diff --git a/harbour/config/win/mingw64.mk b/config/win/mingw64.mk similarity index 100% rename from harbour/config/win/mingw64.mk rename to config/win/mingw64.mk diff --git a/harbour/config/win/msvc.mk b/config/win/msvc.mk similarity index 100% rename from harbour/config/win/msvc.mk rename to config/win/msvc.mk diff --git a/harbour/config/win/msvc64.mk b/config/win/msvc64.mk similarity index 100% rename from harbour/config/win/msvc64.mk rename to config/win/msvc64.mk diff --git a/harbour/config/win/msvcia64.mk b/config/win/msvcia64.mk similarity index 100% rename from harbour/config/win/msvcia64.mk rename to config/win/msvcia64.mk diff --git a/harbour/config/win/pocc.mk b/config/win/pocc.mk similarity index 100% rename from harbour/config/win/pocc.mk rename to config/win/pocc.mk diff --git a/harbour/config/win/pocc64.mk b/config/win/pocc64.mk similarity index 100% rename from harbour/config/win/pocc64.mk rename to config/win/pocc64.mk diff --git a/harbour/config/win/tcc.mk b/config/win/tcc.mk similarity index 100% rename from harbour/config/win/tcc.mk rename to config/win/tcc.mk diff --git a/harbour/config/win/watcom.mk b/config/win/watcom.mk similarity index 100% rename from harbour/config/win/watcom.mk rename to config/win/watcom.mk diff --git a/harbour/config/win/xcc.mk b/config/win/xcc.mk similarity index 100% rename from harbour/config/win/xcc.mk rename to config/win/xcc.mk diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.c b/contrib/3rd/sqlite3/sqlite3.c similarity index 100% rename from harbour/contrib/3rd/sqlite3/sqlite3.c rename to contrib/3rd/sqlite3/sqlite3.c diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.dif b/contrib/3rd/sqlite3/sqlite3.dif similarity index 100% rename from harbour/contrib/3rd/sqlite3/sqlite3.dif rename to contrib/3rd/sqlite3/sqlite3.dif diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.h b/contrib/3rd/sqlite3/sqlite3.h similarity index 100% rename from harbour/contrib/3rd/sqlite3/sqlite3.h rename to contrib/3rd/sqlite3/sqlite3.h diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.hbc b/contrib/3rd/sqlite3/sqlite3.hbc similarity index 100% rename from harbour/contrib/3rd/sqlite3/sqlite3.hbc rename to contrib/3rd/sqlite3/sqlite3.hbc diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.hbp b/contrib/3rd/sqlite3/sqlite3.hbp similarity index 100% rename from harbour/contrib/3rd/sqlite3/sqlite3.hbp rename to contrib/3rd/sqlite3/sqlite3.hbp diff --git a/harbour/contrib/3rd/sqlite3/sqlite3x.h b/contrib/3rd/sqlite3/sqlite3x.h similarity index 100% rename from harbour/contrib/3rd/sqlite3/sqlite3x.h rename to contrib/3rd/sqlite3/sqlite3x.h diff --git a/harbour/contrib/Makefile b/contrib/Makefile similarity index 100% rename from harbour/contrib/Makefile rename to contrib/Makefile diff --git a/harbour/contrib/gtalleg/fixedth.sfc b/contrib/gtalleg/fixedth.sfc similarity index 100% rename from harbour/contrib/gtalleg/fixedth.sfc rename to contrib/gtalleg/fixedth.sfc diff --git a/harbour/contrib/gtalleg/gtalleg.hbc b/contrib/gtalleg/gtalleg.hbc similarity index 100% rename from harbour/contrib/gtalleg/gtalleg.hbc rename to contrib/gtalleg/gtalleg.hbc diff --git a/harbour/contrib/gtalleg/gtalleg.hbm b/contrib/gtalleg/gtalleg.hbm similarity index 100% rename from harbour/contrib/gtalleg/gtalleg.hbm rename to contrib/gtalleg/gtalleg.hbm diff --git a/harbour/contrib/gtalleg/gtalleg.hbp b/contrib/gtalleg/gtalleg.hbp similarity index 100% rename from harbour/contrib/gtalleg/gtalleg.hbp rename to contrib/gtalleg/gtalleg.hbp diff --git a/harbour/contrib/gtalleg/gtalleg.hbx b/contrib/gtalleg/gtalleg.hbx similarity index 100% rename from harbour/contrib/gtalleg/gtalleg.hbx rename to contrib/gtalleg/gtalleg.hbx diff --git a/harbour/contrib/gtalleg/gtallegd.c b/contrib/gtalleg/gtallegd.c similarity index 100% rename from harbour/contrib/gtalleg/gtallegd.c rename to contrib/gtalleg/gtallegd.c diff --git a/harbour/contrib/gtalleg/gtallegs.hbp b/contrib/gtalleg/gtallegs.hbp similarity index 100% rename from harbour/contrib/gtalleg/gtallegs.hbp rename to contrib/gtalleg/gtallegs.hbp diff --git a/harbour/contrib/gtalleg/ssf.c b/contrib/gtalleg/ssf.c similarity index 100% rename from harbour/contrib/gtalleg/ssf.c rename to contrib/gtalleg/ssf.c diff --git a/harbour/contrib/gtalleg/ssf.h b/contrib/gtalleg/ssf.h similarity index 100% rename from harbour/contrib/gtalleg/ssf.h rename to contrib/gtalleg/ssf.h diff --git a/harbour/contrib/gtalleg/tests/hbmk.hbm b/contrib/gtalleg/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/gtalleg/tests/hbmk.hbm rename to contrib/gtalleg/tests/hbmk.hbm diff --git a/harbour/contrib/gtalleg/tests/test.prg b/contrib/gtalleg/tests/test.prg similarity index 100% rename from harbour/contrib/gtalleg/tests/test.prg rename to contrib/gtalleg/tests/test.prg diff --git a/harbour/contrib/gtwvg/3state.prg b/contrib/gtwvg/3state.prg similarity index 100% rename from harbour/contrib/gtwvg/3state.prg rename to contrib/gtwvg/3state.prg diff --git a/harbour/contrib/gtwvg/activex.prg b/contrib/gtwvg/activex.prg similarity index 100% rename from harbour/contrib/gtwvg/activex.prg rename to contrib/gtwvg/activex.prg diff --git a/harbour/contrib/gtwvg/bitmap.prg b/contrib/gtwvg/bitmap.prg similarity index 100% rename from harbour/contrib/gtwvg/bitmap.prg rename to contrib/gtwvg/bitmap.prg diff --git a/harbour/contrib/gtwvg/checkbox.prg b/contrib/gtwvg/checkbox.prg similarity index 100% rename from harbour/contrib/gtwvg/checkbox.prg rename to contrib/gtwvg/checkbox.prg diff --git a/harbour/contrib/gtwvg/class.prg b/contrib/gtwvg/class.prg similarity index 100% rename from harbour/contrib/gtwvg/class.prg rename to contrib/gtwvg/class.prg diff --git a/harbour/contrib/gtwvg/combobox.prg b/contrib/gtwvg/combobox.prg similarity index 100% rename from harbour/contrib/gtwvg/combobox.prg rename to contrib/gtwvg/combobox.prg diff --git a/harbour/contrib/gtwvg/crt.prg b/contrib/gtwvg/crt.prg similarity index 100% rename from harbour/contrib/gtwvg/crt.prg rename to contrib/gtwvg/crt.prg diff --git a/harbour/contrib/gtwvg/dataref.prg b/contrib/gtwvg/dataref.prg similarity index 100% rename from harbour/contrib/gtwvg/dataref.prg rename to contrib/gtwvg/dataref.prg diff --git a/harbour/contrib/gtwvg/dialog.prg b/contrib/gtwvg/dialog.prg similarity index 100% rename from harbour/contrib/gtwvg/dialog.prg rename to contrib/gtwvg/dialog.prg diff --git a/harbour/contrib/gtwvg/drawarea.prg b/contrib/gtwvg/drawarea.prg similarity index 100% rename from harbour/contrib/gtwvg/drawarea.prg rename to contrib/gtwvg/drawarea.prg diff --git a/harbour/contrib/gtwvg/genrc.prg b/contrib/gtwvg/genrc.prg similarity index 100% rename from harbour/contrib/gtwvg/genrc.prg rename to contrib/gtwvg/genrc.prg diff --git a/harbour/contrib/gtwvg/gtwgu.h b/contrib/gtwvg/gtwgu.h similarity index 100% rename from harbour/contrib/gtwvg/gtwgu.h rename to contrib/gtwvg/gtwgu.h diff --git a/harbour/contrib/gtwvg/gtwgud.c b/contrib/gtwvg/gtwgud.c similarity index 100% rename from harbour/contrib/gtwvg/gtwgud.c rename to contrib/gtwvg/gtwgud.c diff --git a/harbour/contrib/gtwvg/gtwvg.h b/contrib/gtwvg/gtwvg.h similarity index 100% rename from harbour/contrib/gtwvg/gtwvg.h rename to contrib/gtwvg/gtwvg.h diff --git a/harbour/contrib/gtwvg/gtwvg.hbc b/contrib/gtwvg/gtwvg.hbc similarity index 100% rename from harbour/contrib/gtwvg/gtwvg.hbc rename to contrib/gtwvg/gtwvg.hbc diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/contrib/gtwvg/gtwvg.hbp similarity index 100% rename from harbour/contrib/gtwvg/gtwvg.hbp rename to contrib/gtwvg/gtwvg.hbp diff --git a/harbour/contrib/gtwvg/gtwvg.hbx b/contrib/gtwvg/gtwvg.hbx similarity index 100% rename from harbour/contrib/gtwvg/gtwvg.hbx rename to contrib/gtwvg/gtwvg.hbx diff --git a/harbour/contrib/gtwvg/gtwvgd.c b/contrib/gtwvg/gtwvgd.c similarity index 100% rename from harbour/contrib/gtwvg/gtwvgd.c rename to contrib/gtwvg/gtwvgd.c diff --git a/harbour/contrib/gtwvg/hbgtwvg.ch b/contrib/gtwvg/hbgtwvg.ch similarity index 100% rename from harbour/contrib/gtwvg/hbgtwvg.ch rename to contrib/gtwvg/hbgtwvg.ch diff --git a/harbour/contrib/gtwvg/htmlview.prg b/contrib/gtwvg/htmlview.prg similarity index 100% rename from harbour/contrib/gtwvg/htmlview.prg rename to contrib/gtwvg/htmlview.prg diff --git a/harbour/contrib/gtwvg/listbox.prg b/contrib/gtwvg/listbox.prg similarity index 100% rename from harbour/contrib/gtwvg/listbox.prg rename to contrib/gtwvg/listbox.prg diff --git a/harbour/contrib/gtwvg/menubar.prg b/contrib/gtwvg/menubar.prg similarity index 100% rename from harbour/contrib/gtwvg/menubar.prg rename to contrib/gtwvg/menubar.prg diff --git a/harbour/contrib/gtwvg/mle.prg b/contrib/gtwvg/mle.prg similarity index 100% rename from harbour/contrib/gtwvg/mle.prg rename to contrib/gtwvg/mle.prg diff --git a/harbour/contrib/gtwvg/paint.prg b/contrib/gtwvg/paint.prg similarity index 100% rename from harbour/contrib/gtwvg/paint.prg rename to contrib/gtwvg/paint.prg diff --git a/harbour/contrib/gtwvg/parthdlr.prg b/contrib/gtwvg/parthdlr.prg similarity index 100% rename from harbour/contrib/gtwvg/parthdlr.prg rename to contrib/gtwvg/parthdlr.prg diff --git a/harbour/contrib/gtwvg/pushbut.prg b/contrib/gtwvg/pushbut.prg similarity index 100% rename from harbour/contrib/gtwvg/pushbut.prg rename to contrib/gtwvg/pushbut.prg diff --git a/harbour/contrib/gtwvg/radiobut.prg b/contrib/gtwvg/radiobut.prg similarity index 100% rename from harbour/contrib/gtwvg/radiobut.prg rename to contrib/gtwvg/radiobut.prg diff --git a/harbour/contrib/gtwvg/scrollbr.prg b/contrib/gtwvg/scrollbr.prg similarity index 100% rename from harbour/contrib/gtwvg/scrollbr.prg rename to contrib/gtwvg/scrollbr.prg diff --git a/harbour/contrib/gtwvg/sle.prg b/contrib/gtwvg/sle.prg similarity index 100% rename from harbour/contrib/gtwvg/sle.prg rename to contrib/gtwvg/sle.prg diff --git a/harbour/contrib/gtwvg/statbar.prg b/contrib/gtwvg/statbar.prg similarity index 100% rename from harbour/contrib/gtwvg/statbar.prg rename to contrib/gtwvg/statbar.prg diff --git a/harbour/contrib/gtwvg/static.prg b/contrib/gtwvg/static.prg similarity index 100% rename from harbour/contrib/gtwvg/static.prg rename to contrib/gtwvg/static.prg diff --git a/harbour/contrib/gtwvg/syswnd.prg b/contrib/gtwvg/syswnd.prg similarity index 100% rename from harbour/contrib/gtwvg/syswnd.prg rename to contrib/gtwvg/syswnd.prg diff --git a/harbour/contrib/gtwvg/tabpage.prg b/contrib/gtwvg/tabpage.prg similarity index 100% rename from harbour/contrib/gtwvg/tabpage.prg rename to contrib/gtwvg/tabpage.prg diff --git a/harbour/contrib/gtwvg/tests/_activex.prg b/contrib/gtwvg/tests/_activex.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/_activex.prg rename to contrib/gtwvg/tests/_activex.prg diff --git a/harbour/contrib/gtwvg/tests/_cuigdlg.prg b/contrib/gtwvg/tests/_cuigdlg.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/_cuigdlg.prg rename to contrib/gtwvg/tests/_cuigdlg.prg diff --git a/harbour/contrib/gtwvg/tests/_dyndlgs.prg b/contrib/gtwvg/tests/_dyndlgs.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/_dyndlgs.prg rename to contrib/gtwvg/tests/_dyndlgs.prg diff --git a/harbour/contrib/gtwvg/tests/_modal.prg b/contrib/gtwvg/tests/_modal.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/_modal.prg rename to contrib/gtwvg/tests/_modal.prg diff --git a/harbour/contrib/gtwvg/tests/_tbrowse.prg b/contrib/gtwvg/tests/_tbrowse.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/_tbrowse.prg rename to contrib/gtwvg/tests/_tbrowse.prg diff --git a/harbour/contrib/gtwvg/tests/_utils.prg b/contrib/gtwvg/tests/_utils.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/_utils.prg rename to contrib/gtwvg/tests/_utils.prg diff --git a/harbour/contrib/gtwvg/tests/_wvtcls.prg b/contrib/gtwvg/tests/_wvtcls.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/_wvtcls.prg rename to contrib/gtwvg/tests/_wvtcls.prg diff --git a/harbour/contrib/gtwvg/tests/_xbp.prg b/contrib/gtwvg/tests/_xbp.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/_xbp.prg rename to contrib/gtwvg/tests/_xbp.prg diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/contrib/gtwvg/tests/demowvg.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/demowvg.prg rename to contrib/gtwvg/tests/demowvg.prg diff --git a/harbour/contrib/gtwvg/tests/demowvg1.prg b/contrib/gtwvg/tests/demowvg1.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/demowvg1.prg rename to contrib/gtwvg/tests/demowvg1.prg diff --git a/harbour/contrib/gtwvg/tests/demoxbp.prg b/contrib/gtwvg/tests/demoxbp.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/demoxbp.prg rename to contrib/gtwvg/tests/demoxbp.prg diff --git a/harbour/contrib/gtwvg/tests/dia_excl.ico b/contrib/gtwvg/tests/dia_excl.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/dia_excl.ico rename to contrib/gtwvg/tests/dia_excl.ico diff --git a/harbour/contrib/gtwvg/tests/hbmk.hbm b/contrib/gtwvg/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/gtwvg/tests/hbmk.hbm rename to contrib/gtwvg/tests/hbmk.hbm diff --git a/harbour/contrib/gtwvg/tests/myharu.pdf b/contrib/gtwvg/tests/myharu.pdf similarity index 100% rename from harbour/contrib/gtwvg/tests/myharu.pdf rename to contrib/gtwvg/tests/myharu.pdf diff --git a/harbour/contrib/gtwvg/tests/v_browse.ico b/contrib/gtwvg/tests/v_browse.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/v_browse.ico rename to contrib/gtwvg/tests/v_browse.ico diff --git a/harbour/contrib/gtwvg/tests/v_calend.bmp b/contrib/gtwvg/tests/v_calend.bmp similarity index 100% rename from harbour/contrib/gtwvg/tests/v_calend.bmp rename to contrib/gtwvg/tests/v_calend.bmp diff --git a/harbour/contrib/gtwvg/tests/v_clclt.bmp b/contrib/gtwvg/tests/v_clclt.bmp similarity index 100% rename from harbour/contrib/gtwvg/tests/v_clclt.bmp rename to contrib/gtwvg/tests/v_clclt.bmp diff --git a/harbour/contrib/gtwvg/tests/v_clclt.ico b/contrib/gtwvg/tests/v_clclt.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/v_clclt.ico rename to contrib/gtwvg/tests/v_clclt.ico diff --git a/harbour/contrib/gtwvg/tests/v_filter.ico b/contrib/gtwvg/tests/v_filter.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/v_filter.ico rename to contrib/gtwvg/tests/v_filter.ico diff --git a/harbour/contrib/gtwvg/tests/v_help.ico b/contrib/gtwvg/tests/v_help.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/v_help.ico rename to contrib/gtwvg/tests/v_help.ico diff --git a/harbour/contrib/gtwvg/tests/v_index.bmp b/contrib/gtwvg/tests/v_index.bmp similarity index 100% rename from harbour/contrib/gtwvg/tests/v_index.bmp rename to contrib/gtwvg/tests/v_index.bmp diff --git a/harbour/contrib/gtwvg/tests/v_lock.bmp b/contrib/gtwvg/tests/v_lock.bmp similarity index 100% rename from harbour/contrib/gtwvg/tests/v_lock.bmp rename to contrib/gtwvg/tests/v_lock.bmp diff --git a/harbour/contrib/gtwvg/tests/v_new.bmp b/contrib/gtwvg/tests/v_new.bmp similarity index 100% rename from harbour/contrib/gtwvg/tests/v_new.bmp rename to contrib/gtwvg/tests/v_new.bmp diff --git a/harbour/contrib/gtwvg/tests/v_notes.ico b/contrib/gtwvg/tests/v_notes.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/v_notes.ico rename to contrib/gtwvg/tests/v_notes.ico diff --git a/harbour/contrib/gtwvg/tests/v_notes1.bmp b/contrib/gtwvg/tests/v_notes1.bmp similarity index 100% rename from harbour/contrib/gtwvg/tests/v_notes1.bmp rename to contrib/gtwvg/tests/v_notes1.bmp diff --git a/harbour/contrib/gtwvg/tests/v_selct1.bmp b/contrib/gtwvg/tests/v_selct1.bmp similarity index 100% rename from harbour/contrib/gtwvg/tests/v_selct1.bmp rename to contrib/gtwvg/tests/v_selct1.bmp diff --git a/harbour/contrib/gtwvg/tests/v_tools.ico b/contrib/gtwvg/tests/v_tools.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/v_tools.ico rename to contrib/gtwvg/tests/v_tools.ico diff --git a/harbour/contrib/gtwvg/tests/vouch1.bmp b/contrib/gtwvg/tests/vouch1.bmp similarity index 100% rename from harbour/contrib/gtwvg/tests/vouch1.bmp rename to contrib/gtwvg/tests/vouch1.bmp diff --git a/harbour/contrib/gtwvg/tests/vr_1.ico b/contrib/gtwvg/tests/vr_1.ico similarity index 100% rename from harbour/contrib/gtwvg/tests/vr_1.ico rename to contrib/gtwvg/tests/vr_1.ico diff --git a/harbour/contrib/gtwvg/toolbar.prg b/contrib/gtwvg/toolbar.prg similarity index 100% rename from harbour/contrib/gtwvg/toolbar.prg rename to contrib/gtwvg/toolbar.prg diff --git a/harbour/contrib/gtwvg/treeview.prg b/contrib/gtwvg/treeview.prg similarity index 100% rename from harbour/contrib/gtwvg/treeview.prg rename to contrib/gtwvg/treeview.prg diff --git a/harbour/contrib/gtwvg/wnd.prg b/contrib/gtwvg/wnd.prg similarity index 100% rename from harbour/contrib/gtwvg/wnd.prg rename to contrib/gtwvg/wnd.prg diff --git a/harbour/contrib/gtwvg/wvgcore.c b/contrib/gtwvg/wvgcore.c similarity index 100% rename from harbour/contrib/gtwvg/wvgcore.c rename to contrib/gtwvg/wvgcore.c diff --git a/harbour/contrib/gtwvg/wvgcuig.c b/contrib/gtwvg/wvgcuig.c similarity index 100% rename from harbour/contrib/gtwvg/wvgcuig.c rename to contrib/gtwvg/wvgcuig.c diff --git a/harbour/contrib/gtwvg/wvgparts.ch b/contrib/gtwvg/wvgparts.ch similarity index 100% rename from harbour/contrib/gtwvg/wvgparts.ch rename to contrib/gtwvg/wvgparts.ch diff --git a/harbour/contrib/gtwvg/wvgutils.c b/contrib/gtwvg/wvgutils.c similarity index 100% rename from harbour/contrib/gtwvg/wvgutils.c rename to contrib/gtwvg/wvgutils.c diff --git a/harbour/contrib/gtwvg/wvgwin.c b/contrib/gtwvg/wvgwin.c similarity index 100% rename from harbour/contrib/gtwvg/wvgwin.c rename to contrib/gtwvg/wvgwin.c diff --git a/harbour/contrib/gtwvg/wvgwing.c b/contrib/gtwvg/wvgwing.c similarity index 100% rename from harbour/contrib/gtwvg/wvgwing.c rename to contrib/gtwvg/wvgwing.c diff --git a/harbour/contrib/gtwvg/wvtwin.ch b/contrib/gtwvg/wvtwin.ch similarity index 100% rename from harbour/contrib/gtwvg/wvtwin.ch rename to contrib/gtwvg/wvtwin.ch diff --git a/harbour/contrib/hbamf/amf.h b/contrib/hbamf/amf.h similarity index 100% rename from harbour/contrib/hbamf/amf.h rename to contrib/hbamf/amf.h diff --git a/harbour/contrib/hbamf/amfdec.c b/contrib/hbamf/amfdec.c similarity index 100% rename from harbour/contrib/hbamf/amfdec.c rename to contrib/hbamf/amfdec.c diff --git a/harbour/contrib/hbamf/amfenc.c b/contrib/hbamf/amfenc.c similarity index 100% rename from harbour/contrib/hbamf/amfenc.c rename to contrib/hbamf/amfenc.c diff --git a/harbour/contrib/hbamf/amfstdio.c b/contrib/hbamf/amfstdio.c similarity index 100% rename from harbour/contrib/hbamf/amfstdio.c rename to contrib/hbamf/amfstdio.c diff --git a/harbour/contrib/hbamf/hbamf.hbc b/contrib/hbamf/hbamf.hbc similarity index 100% rename from harbour/contrib/hbamf/hbamf.hbc rename to contrib/hbamf/hbamf.hbc diff --git a/harbour/contrib/hbamf/hbamf.hbp b/contrib/hbamf/hbamf.hbp similarity index 100% rename from harbour/contrib/hbamf/hbamf.hbp rename to contrib/hbamf/hbamf.hbp diff --git a/harbour/contrib/hbamf/hbamf.hbx b/contrib/hbamf/hbamf.hbx similarity index 100% rename from harbour/contrib/hbamf/hbamf.hbx rename to contrib/hbamf/hbamf.hbx diff --git a/harbour/contrib/hbamf/hbamfobj.prg b/contrib/hbamf/hbamfobj.prg similarity index 100% rename from harbour/contrib/hbamf/hbamfobj.prg rename to contrib/hbamf/hbamfobj.prg diff --git a/harbour/contrib/hbamf/hbcls.c b/contrib/hbamf/hbcls.c similarity index 100% rename from harbour/contrib/hbamf/hbcls.c rename to contrib/hbamf/hbcls.c diff --git a/harbour/contrib/hbamf/issues.txt b/contrib/hbamf/issues.txt similarity index 100% rename from harbour/contrib/hbamf/issues.txt rename to contrib/hbamf/issues.txt diff --git a/harbour/contrib/hbamf/readme.txt b/contrib/hbamf/readme.txt similarity index 100% rename from harbour/contrib/hbamf/readme.txt rename to contrib/hbamf/readme.txt diff --git a/harbour/contrib/hbamf/tests/hbmk.hbm b/contrib/hbamf/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbamf/tests/hbmk.hbm rename to contrib/hbamf/tests/hbmk.hbm diff --git a/harbour/contrib/hbamf/tests/test.prg b/contrib/hbamf/tests/test.prg similarity index 100% rename from harbour/contrib/hbamf/tests/test.prg rename to contrib/hbamf/tests/test.prg diff --git a/harbour/contrib/hbblat/blatcls.prg b/contrib/hbblat/blatcls.prg similarity index 100% rename from harbour/contrib/hbblat/blatcls.prg rename to contrib/hbblat/blatcls.prg diff --git a/harbour/contrib/hbblat/blatwrp.c b/contrib/hbblat/blatwrp.c similarity index 100% rename from harbour/contrib/hbblat/blatwrp.c rename to contrib/hbblat/blatwrp.c diff --git a/harbour/contrib/hbblat/hbblat.ch b/contrib/hbblat/hbblat.ch similarity index 100% rename from harbour/contrib/hbblat/hbblat.ch rename to contrib/hbblat/hbblat.ch diff --git a/harbour/contrib/hbblat/hbblat.hbc b/contrib/hbblat/hbblat.hbc similarity index 100% rename from harbour/contrib/hbblat/hbblat.hbc rename to contrib/hbblat/hbblat.hbc diff --git a/harbour/contrib/hbblat/hbblat.hbp b/contrib/hbblat/hbblat.hbp similarity index 100% rename from harbour/contrib/hbblat/hbblat.hbp rename to contrib/hbblat/hbblat.hbp diff --git a/harbour/contrib/hbblat/hbblat.hbx b/contrib/hbblat/hbblat.hbx similarity index 100% rename from harbour/contrib/hbblat/hbblat.hbx rename to contrib/hbblat/hbblat.hbx diff --git a/harbour/contrib/hbblat/readme.txt b/contrib/hbblat/readme.txt similarity index 100% rename from harbour/contrib/hbblat/readme.txt rename to contrib/hbblat/readme.txt diff --git a/harbour/contrib/hbblat/tests/blatcmd.prg b/contrib/hbblat/tests/blatcmd.prg similarity index 100% rename from harbour/contrib/hbblat/tests/blatcmd.prg rename to contrib/hbblat/tests/blatcmd.prg diff --git a/harbour/contrib/hbblat/tests/f_listtx.txt b/contrib/hbblat/tests/f_listtx.txt similarity index 100% rename from harbour/contrib/hbblat/tests/f_listtx.txt rename to contrib/hbblat/tests/f_listtx.txt diff --git a/harbour/contrib/hbblat/tests/f_ps.txt b/contrib/hbblat/tests/f_ps.txt similarity index 100% rename from harbour/contrib/hbblat/tests/f_ps.txt rename to contrib/hbblat/tests/f_ps.txt diff --git a/harbour/contrib/hbblat/tests/f_sampl1.txt b/contrib/hbblat/tests/f_sampl1.txt similarity index 100% rename from harbour/contrib/hbblat/tests/f_sampl1.txt rename to contrib/hbblat/tests/f_sampl1.txt diff --git a/harbour/contrib/hbblat/tests/f_sample.txt b/contrib/hbblat/tests/f_sample.txt similarity index 100% rename from harbour/contrib/hbblat/tests/f_sample.txt rename to contrib/hbblat/tests/f_sample.txt diff --git a/harbour/contrib/hbblat/tests/f_subjct.txt b/contrib/hbblat/tests/f_subjct.txt similarity index 100% rename from harbour/contrib/hbblat/tests/f_subjct.txt rename to contrib/hbblat/tests/f_subjct.txt diff --git a/harbour/contrib/hbblat/tests/hbmk.hbm b/contrib/hbblat/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbblat/tests/hbmk.hbm rename to contrib/hbblat/tests/hbmk.hbm diff --git a/harbour/contrib/hbblat/tests/test.prg b/contrib/hbblat/tests/test.prg similarity index 100% rename from harbour/contrib/hbblat/tests/test.prg rename to contrib/hbblat/tests/test.prg diff --git a/harbour/contrib/hbblink/blinker.prg b/contrib/hbblink/blinker.prg similarity index 100% rename from harbour/contrib/hbblink/blinker.prg rename to contrib/hbblink/blinker.prg diff --git a/harbour/contrib/hbblink/hbblink.ch b/contrib/hbblink/hbblink.ch similarity index 100% rename from harbour/contrib/hbblink/hbblink.ch rename to contrib/hbblink/hbblink.ch diff --git a/harbour/contrib/hbblink/hbblink.hbc b/contrib/hbblink/hbblink.hbc similarity index 100% rename from harbour/contrib/hbblink/hbblink.hbc rename to contrib/hbblink/hbblink.hbc diff --git a/harbour/contrib/hbblink/hbblink.hbp b/contrib/hbblink/hbblink.hbp similarity index 100% rename from harbour/contrib/hbblink/hbblink.hbp rename to contrib/hbblink/hbblink.hbp diff --git a/harbour/contrib/hbblink/hbblink.hbx b/contrib/hbblink/hbblink.hbx similarity index 100% rename from harbour/contrib/hbblink/hbblink.hbx rename to contrib/hbblink/hbblink.hbx diff --git a/harbour/contrib/hbbz2/3rd/bz2/LICENSE b/contrib/hbbz2/3rd/bz2/LICENSE similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/LICENSE rename to contrib/hbbz2/3rd/bz2/LICENSE diff --git a/harbour/contrib/hbbz2/3rd/bz2/blocksor.c b/contrib/hbbz2/3rd/bz2/blocksor.c similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/blocksor.c rename to contrib/hbbz2/3rd/bz2/blocksor.c diff --git a/harbour/contrib/hbbz2/3rd/bz2/bz2.dif b/contrib/hbbz2/3rd/bz2/bz2.dif similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/bz2.dif rename to contrib/hbbz2/3rd/bz2/bz2.dif diff --git a/harbour/contrib/hbbz2/3rd/bz2/bz2.hbc b/contrib/hbbz2/3rd/bz2/bz2.hbc similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/bz2.hbc rename to contrib/hbbz2/3rd/bz2/bz2.hbc diff --git a/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp b/contrib/hbbz2/3rd/bz2/bz2.hbp similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/bz2.hbp rename to contrib/hbbz2/3rd/bz2/bz2.hbp diff --git a/harbour/contrib/hbbz2/3rd/bz2/bzlib.c b/contrib/hbbz2/3rd/bz2/bzlib.c similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/bzlib.c rename to contrib/hbbz2/3rd/bz2/bzlib.c diff --git a/harbour/contrib/hbbz2/3rd/bz2/bzlib.h b/contrib/hbbz2/3rd/bz2/bzlib.h similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/bzlib.h rename to contrib/hbbz2/3rd/bz2/bzlib.h diff --git a/harbour/contrib/hbbz2/3rd/bz2/bzlib_pr.h b/contrib/hbbz2/3rd/bz2/bzlib_pr.h similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/bzlib_pr.h rename to contrib/hbbz2/3rd/bz2/bzlib_pr.h diff --git a/harbour/contrib/hbbz2/3rd/bz2/compress.c b/contrib/hbbz2/3rd/bz2/compress.c similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/compress.c rename to contrib/hbbz2/3rd/bz2/compress.c diff --git a/harbour/contrib/hbbz2/3rd/bz2/crctable.c b/contrib/hbbz2/3rd/bz2/crctable.c similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/crctable.c rename to contrib/hbbz2/3rd/bz2/crctable.c diff --git a/harbour/contrib/hbbz2/3rd/bz2/decompre.c b/contrib/hbbz2/3rd/bz2/decompre.c similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/decompre.c rename to contrib/hbbz2/3rd/bz2/decompre.c diff --git a/harbour/contrib/hbbz2/3rd/bz2/huffman.c b/contrib/hbbz2/3rd/bz2/huffman.c similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/huffman.c rename to contrib/hbbz2/3rd/bz2/huffman.c diff --git a/harbour/contrib/hbbz2/3rd/bz2/randtabl.c b/contrib/hbbz2/3rd/bz2/randtabl.c similarity index 100% rename from harbour/contrib/hbbz2/3rd/bz2/randtabl.c rename to contrib/hbbz2/3rd/bz2/randtabl.c diff --git a/harbour/contrib/hbbz2/core.c b/contrib/hbbz2/core.c similarity index 100% rename from harbour/contrib/hbbz2/core.c rename to contrib/hbbz2/core.c diff --git a/harbour/contrib/hbbz2/hbbz2.ch b/contrib/hbbz2/hbbz2.ch similarity index 100% rename from harbour/contrib/hbbz2/hbbz2.ch rename to contrib/hbbz2/hbbz2.ch diff --git a/harbour/contrib/hbbz2/hbbz2.hbc b/contrib/hbbz2/hbbz2.hbc similarity index 100% rename from harbour/contrib/hbbz2/hbbz2.hbc rename to contrib/hbbz2/hbbz2.hbc diff --git a/harbour/contrib/hbbz2/hbbz2.hbp b/contrib/hbbz2/hbbz2.hbp similarity index 100% rename from harbour/contrib/hbbz2/hbbz2.hbp rename to contrib/hbbz2/hbbz2.hbp diff --git a/harbour/contrib/hbbz2/hbbz2.hbx b/contrib/hbbz2/hbbz2.hbx similarity index 100% rename from harbour/contrib/hbbz2/hbbz2.hbx rename to contrib/hbbz2/hbbz2.hbx diff --git a/harbour/contrib/hbbz2/tests/hbmk.hbm b/contrib/hbbz2/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbbz2/tests/hbmk.hbm rename to contrib/hbbz2/tests/hbmk.hbm diff --git a/harbour/contrib/hbbz2/tests/test.prg b/contrib/hbbz2/tests/test.prg similarity index 100% rename from harbour/contrib/hbbz2/tests/test.prg rename to contrib/hbbz2/tests/test.prg diff --git a/harbour/contrib/hbcairo/context.c b/contrib/hbcairo/context.c similarity index 100% rename from harbour/contrib/hbcairo/context.c rename to contrib/hbcairo/context.c diff --git a/harbour/contrib/hbcairo/core.c b/contrib/hbcairo/core.c similarity index 100% rename from harbour/contrib/hbcairo/core.c rename to contrib/hbcairo/core.c diff --git a/harbour/contrib/hbcairo/hbcairo.ch b/contrib/hbcairo/hbcairo.ch similarity index 100% rename from harbour/contrib/hbcairo/hbcairo.ch rename to contrib/hbcairo/hbcairo.ch diff --git a/harbour/contrib/hbcairo/hbcairo.h b/contrib/hbcairo/hbcairo.h similarity index 100% rename from harbour/contrib/hbcairo/hbcairo.h rename to contrib/hbcairo/hbcairo.h diff --git a/harbour/contrib/hbcairo/hbcairo.hbc b/contrib/hbcairo/hbcairo.hbc similarity index 100% rename from harbour/contrib/hbcairo/hbcairo.hbc rename to contrib/hbcairo/hbcairo.hbc diff --git a/harbour/contrib/hbcairo/hbcairo.hbp b/contrib/hbcairo/hbcairo.hbp similarity index 100% rename from harbour/contrib/hbcairo/hbcairo.hbp rename to contrib/hbcairo/hbcairo.hbp diff --git a/harbour/contrib/hbcairo/hbcairo.hbx b/contrib/hbcairo/hbcairo.hbx similarity index 100% rename from harbour/contrib/hbcairo/hbcairo.hbx rename to contrib/hbcairo/hbcairo.hbx diff --git a/harbour/contrib/hbcairo/image.c b/contrib/hbcairo/image.c similarity index 100% rename from harbour/contrib/hbcairo/image.c rename to contrib/hbcairo/image.c diff --git a/harbour/contrib/hbcairo/paths.c b/contrib/hbcairo/paths.c similarity index 100% rename from harbour/contrib/hbcairo/paths.c rename to contrib/hbcairo/paths.c diff --git a/harbour/contrib/hbcairo/pdf.c b/contrib/hbcairo/pdf.c similarity index 100% rename from harbour/contrib/hbcairo/pdf.c rename to contrib/hbcairo/pdf.c diff --git a/harbour/contrib/hbcairo/png.c b/contrib/hbcairo/png.c similarity index 100% rename from harbour/contrib/hbcairo/png.c rename to contrib/hbcairo/png.c diff --git a/harbour/contrib/hbcairo/ps.c b/contrib/hbcairo/ps.c similarity index 100% rename from harbour/contrib/hbcairo/ps.c rename to contrib/hbcairo/ps.c diff --git a/harbour/contrib/hbcairo/surface.c b/contrib/hbcairo/surface.c similarity index 100% rename from harbour/contrib/hbcairo/surface.c rename to contrib/hbcairo/surface.c diff --git a/harbour/contrib/hbcairo/tests/fancytxt.prg b/contrib/hbcairo/tests/fancytxt.prg similarity index 100% rename from harbour/contrib/hbcairo/tests/fancytxt.prg rename to contrib/hbcairo/tests/fancytxt.prg diff --git a/harbour/contrib/hbcairo/tests/glyphdbg.prg b/contrib/hbcairo/tests/glyphdbg.prg similarity index 100% rename from harbour/contrib/hbcairo/tests/glyphdbg.prg rename to contrib/hbcairo/tests/glyphdbg.prg diff --git a/harbour/contrib/hbcairo/tests/hbmk.hbm b/contrib/hbcairo/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbcairo/tests/hbmk.hbm rename to contrib/hbcairo/tests/hbmk.hbm diff --git a/harbour/contrib/hbcairo/tests/hellow.prg b/contrib/hbcairo/tests/hellow.prg similarity index 100% rename from harbour/contrib/hbcairo/tests/hellow.prg rename to contrib/hbcairo/tests/hellow.prg diff --git a/harbour/contrib/hbcairo/tests/lightning.prg b/contrib/hbcairo/tests/lightning.prg similarity index 100% rename from harbour/contrib/hbcairo/tests/lightning.prg rename to contrib/hbcairo/tests/lightning.prg diff --git a/harbour/contrib/hbcairo/tests/table.prg b/contrib/hbcairo/tests/table.prg similarity index 100% rename from harbour/contrib/hbcairo/tests/table.prg rename to contrib/hbcairo/tests/table.prg diff --git a/harbour/contrib/hbcairo/text.c b/contrib/hbcairo/text.c similarity index 100% rename from harbour/contrib/hbcairo/text.c rename to contrib/hbcairo/text.c diff --git a/harbour/contrib/hbcairo/transfor.c b/contrib/hbcairo/transfor.c similarity index 100% rename from harbour/contrib/hbcairo/transfor.c rename to contrib/hbcairo/transfor.c diff --git a/harbour/contrib/hbcairo/util.c b/contrib/hbcairo/util.c similarity index 100% rename from harbour/contrib/hbcairo/util.c rename to contrib/hbcairo/util.c diff --git a/harbour/contrib/hbcomm/comm.prg b/contrib/hbcomm/comm.prg similarity index 100% rename from harbour/contrib/hbcomm/comm.prg rename to contrib/hbcomm/comm.prg diff --git a/harbour/contrib/hbcomm/hbcomm.hbc b/contrib/hbcomm/hbcomm.hbc similarity index 100% rename from harbour/contrib/hbcomm/hbcomm.hbc rename to contrib/hbcomm/hbcomm.hbc diff --git a/harbour/contrib/hbcomm/hbcomm.hbp b/contrib/hbcomm/hbcomm.hbp similarity index 100% rename from harbour/contrib/hbcomm/hbcomm.hbp rename to contrib/hbcomm/hbcomm.hbp diff --git a/harbour/contrib/hbcomm/hbcomm.hbx b/contrib/hbcomm/hbcomm.hbx similarity index 100% rename from harbour/contrib/hbcomm/hbcomm.hbx rename to contrib/hbcomm/hbcomm.hbx diff --git a/harbour/contrib/hbcomm/tests/hbmk.hbm b/contrib/hbcomm/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbcomm/tests/hbmk.hbm rename to contrib/hbcomm/tests/hbmk.hbm diff --git a/harbour/contrib/hbcomm/tests/test.prg b/contrib/hbcomm/tests/test.prg similarity index 100% rename from harbour/contrib/hbcomm/tests/test.prg rename to contrib/hbcomm/tests/test.prg diff --git a/harbour/contrib/hbct/addascii.c b/contrib/hbct/addascii.c similarity index 100% rename from harbour/contrib/hbct/addascii.c rename to contrib/hbct/addascii.c diff --git a/harbour/contrib/hbct/asciisum.c b/contrib/hbct/asciisum.c similarity index 100% rename from harbour/contrib/hbct/asciisum.c rename to contrib/hbct/asciisum.c diff --git a/harbour/contrib/hbct/ascpos.c b/contrib/hbct/ascpos.c similarity index 100% rename from harbour/contrib/hbct/ascpos.c rename to contrib/hbct/ascpos.c diff --git a/harbour/contrib/hbct/atadjust.c b/contrib/hbct/atadjust.c similarity index 100% rename from harbour/contrib/hbct/atadjust.c rename to contrib/hbct/atadjust.c diff --git a/harbour/contrib/hbct/atnum.c b/contrib/hbct/atnum.c similarity index 100% rename from harbour/contrib/hbct/atnum.c rename to contrib/hbct/atnum.c diff --git a/harbour/contrib/hbct/atrepl.c b/contrib/hbct/atrepl.c similarity index 100% rename from harbour/contrib/hbct/atrepl.c rename to contrib/hbct/atrepl.c diff --git a/harbour/contrib/hbct/bitnum.c b/contrib/hbct/bitnum.c similarity index 100% rename from harbour/contrib/hbct/bitnum.c rename to contrib/hbct/bitnum.c diff --git a/harbour/contrib/hbct/bitstr.c b/contrib/hbct/bitstr.c similarity index 100% rename from harbour/contrib/hbct/bitstr.c rename to contrib/hbct/bitstr.c diff --git a/harbour/contrib/hbct/blank.c b/contrib/hbct/blank.c similarity index 100% rename from harbour/contrib/hbct/blank.c rename to contrib/hbct/blank.c diff --git a/harbour/contrib/hbct/charevod.c b/contrib/hbct/charevod.c similarity index 100% rename from harbour/contrib/hbct/charevod.c rename to contrib/hbct/charevod.c diff --git a/harbour/contrib/hbct/charlihb.c b/contrib/hbct/charlihb.c similarity index 100% rename from harbour/contrib/hbct/charlihb.c rename to contrib/hbct/charlihb.c diff --git a/harbour/contrib/hbct/charlist.c b/contrib/hbct/charlist.c similarity index 100% rename from harbour/contrib/hbct/charlist.c rename to contrib/hbct/charlist.c diff --git a/harbour/contrib/hbct/charmirr.c b/contrib/hbct/charmirr.c similarity index 100% rename from harbour/contrib/hbct/charmirr.c rename to contrib/hbct/charmirr.c diff --git a/harbour/contrib/hbct/charmix.c b/contrib/hbct/charmix.c similarity index 100% rename from harbour/contrib/hbct/charmix.c rename to contrib/hbct/charmix.c diff --git a/harbour/contrib/hbct/charone.c b/contrib/hbct/charone.c similarity index 100% rename from harbour/contrib/hbct/charone.c rename to contrib/hbct/charone.c diff --git a/harbour/contrib/hbct/charonly.c b/contrib/hbct/charonly.c similarity index 100% rename from harbour/contrib/hbct/charonly.c rename to contrib/hbct/charonly.c diff --git a/harbour/contrib/hbct/charop.c b/contrib/hbct/charop.c similarity index 100% rename from harbour/contrib/hbct/charop.c rename to contrib/hbct/charop.c diff --git a/harbour/contrib/hbct/charophb.c b/contrib/hbct/charophb.c similarity index 100% rename from harbour/contrib/hbct/charophb.c rename to contrib/hbct/charophb.c diff --git a/harbour/contrib/hbct/charrepl.c b/contrib/hbct/charrepl.c similarity index 100% rename from harbour/contrib/hbct/charrepl.c rename to contrib/hbct/charrepl.c diff --git a/harbour/contrib/hbct/charsort.c b/contrib/hbct/charsort.c similarity index 100% rename from harbour/contrib/hbct/charsort.c rename to contrib/hbct/charsort.c diff --git a/harbour/contrib/hbct/charsprd.c b/contrib/hbct/charsprd.c similarity index 100% rename from harbour/contrib/hbct/charsprd.c rename to contrib/hbct/charsprd.c diff --git a/harbour/contrib/hbct/charswap.c b/contrib/hbct/charswap.c similarity index 100% rename from harbour/contrib/hbct/charswap.c rename to contrib/hbct/charswap.c diff --git a/harbour/contrib/hbct/color.c b/contrib/hbct/color.c similarity index 100% rename from harbour/contrib/hbct/color.c rename to contrib/hbct/color.c diff --git a/harbour/contrib/hbct/count.c b/contrib/hbct/count.c similarity index 100% rename from harbour/contrib/hbct/count.c rename to contrib/hbct/count.c diff --git a/harbour/contrib/hbct/ct.ch b/contrib/hbct/ct.ch similarity index 100% rename from harbour/contrib/hbct/ct.ch rename to contrib/hbct/ct.ch diff --git a/harbour/contrib/hbct/ct.h b/contrib/hbct/ct.h similarity index 100% rename from harbour/contrib/hbct/ct.h rename to contrib/hbct/ct.h diff --git a/harbour/contrib/hbct/ct.prg b/contrib/hbct/ct.prg similarity index 100% rename from harbour/contrib/hbct/ct.prg rename to contrib/hbct/ct.prg diff --git a/harbour/contrib/hbct/ctc.c b/contrib/hbct/ctc.c similarity index 100% rename from harbour/contrib/hbct/ctc.c rename to contrib/hbct/ctc.c diff --git a/harbour/contrib/hbct/ctchksum.c b/contrib/hbct/ctchksum.c similarity index 100% rename from harbour/contrib/hbct/ctchksum.c rename to contrib/hbct/ctchksum.c diff --git a/harbour/contrib/hbct/ctcom.ch b/contrib/hbct/ctcom.ch similarity index 100% rename from harbour/contrib/hbct/ctcom.ch rename to contrib/hbct/ctcom.ch diff --git a/harbour/contrib/hbct/ctcom1.c b/contrib/hbct/ctcom1.c similarity index 100% rename from harbour/contrib/hbct/ctcom1.c rename to contrib/hbct/ctcom1.c diff --git a/harbour/contrib/hbct/ctcom2.c b/contrib/hbct/ctcom2.c similarity index 100% rename from harbour/contrib/hbct/ctcom2.c rename to contrib/hbct/ctcom2.c diff --git a/harbour/contrib/hbct/ctcrypt.c b/contrib/hbct/ctcrypt.c similarity index 100% rename from harbour/contrib/hbct/ctcrypt.c rename to contrib/hbct/ctcrypt.c diff --git a/harbour/contrib/hbct/ctdisk.ch b/contrib/hbct/ctdisk.ch similarity index 100% rename from harbour/contrib/hbct/ctdisk.ch rename to contrib/hbct/ctdisk.ch diff --git a/harbour/contrib/hbct/ctdummy.prg b/contrib/hbct/ctdummy.prg similarity index 100% rename from harbour/contrib/hbct/ctdummy.prg rename to contrib/hbct/ctdummy.prg diff --git a/harbour/contrib/hbct/cterror.ch b/contrib/hbct/cterror.ch similarity index 100% rename from harbour/contrib/hbct/cterror.ch rename to contrib/hbct/cterror.ch diff --git a/harbour/contrib/hbct/ctmath.c b/contrib/hbct/ctmath.c similarity index 100% rename from harbour/contrib/hbct/ctmath.c rename to contrib/hbct/ctmath.c diff --git a/harbour/contrib/hbct/ctmath.h b/contrib/hbct/ctmath.h similarity index 100% rename from harbour/contrib/hbct/ctmath.h rename to contrib/hbct/ctmath.h diff --git a/harbour/contrib/hbct/ctmath2.c b/contrib/hbct/ctmath2.c similarity index 100% rename from harbour/contrib/hbct/ctmath2.c rename to contrib/hbct/ctmath2.c diff --git a/harbour/contrib/hbct/ctmisc.prg b/contrib/hbct/ctmisc.prg similarity index 100% rename from harbour/contrib/hbct/ctmisc.prg rename to contrib/hbct/ctmisc.prg diff --git a/harbour/contrib/hbct/ctnet.c b/contrib/hbct/ctnet.c similarity index 100% rename from harbour/contrib/hbct/ctnet.c rename to contrib/hbct/ctnet.c diff --git a/harbour/contrib/hbct/ctpad.c b/contrib/hbct/ctpad.c similarity index 100% rename from harbour/contrib/hbct/ctpad.c rename to contrib/hbct/ctpad.c diff --git a/harbour/contrib/hbct/ctrand.prg b/contrib/hbct/ctrand.prg similarity index 100% rename from harbour/contrib/hbct/ctrand.prg rename to contrib/hbct/ctrand.prg diff --git a/harbour/contrib/hbct/ctscan.ch b/contrib/hbct/ctscan.ch similarity index 100% rename from harbour/contrib/hbct/ctscan.ch rename to contrib/hbct/ctscan.ch diff --git a/harbour/contrib/hbct/ctset.c b/contrib/hbct/ctset.c similarity index 100% rename from harbour/contrib/hbct/ctset.c rename to contrib/hbct/ctset.c diff --git a/harbour/contrib/hbct/ctset.h b/contrib/hbct/ctset.h similarity index 100% rename from harbour/contrib/hbct/ctset.h rename to contrib/hbct/ctset.h diff --git a/harbour/contrib/hbct/ctstr.c b/contrib/hbct/ctstr.c similarity index 100% rename from harbour/contrib/hbct/ctstr.c rename to contrib/hbct/ctstr.c diff --git a/harbour/contrib/hbct/ctstr.h b/contrib/hbct/ctstr.h similarity index 100% rename from harbour/contrib/hbct/ctstr.h rename to contrib/hbct/ctstr.h diff --git a/harbour/contrib/hbct/ctstrfil.c b/contrib/hbct/ctstrfil.c similarity index 100% rename from harbour/contrib/hbct/ctstrfil.c rename to contrib/hbct/ctstrfil.c diff --git a/harbour/contrib/hbct/ctstrfil.h b/contrib/hbct/ctstrfil.h similarity index 100% rename from harbour/contrib/hbct/ctstrfil.h rename to contrib/hbct/ctstrfil.h diff --git a/harbour/contrib/hbct/cttime.prg b/contrib/hbct/cttime.prg similarity index 100% rename from harbour/contrib/hbct/cttime.prg rename to contrib/hbct/cttime.prg diff --git a/harbour/contrib/hbct/ctvideo.ch b/contrib/hbct/ctvideo.ch similarity index 100% rename from harbour/contrib/hbct/ctvideo.ch rename to contrib/hbct/ctvideo.ch diff --git a/harbour/contrib/hbct/ctwfunc.c b/contrib/hbct/ctwfunc.c similarity index 100% rename from harbour/contrib/hbct/ctwfunc.c rename to contrib/hbct/ctwfunc.c diff --git a/harbour/contrib/hbct/ctwin.c b/contrib/hbct/ctwin.c similarity index 100% rename from harbour/contrib/hbct/ctwin.c rename to contrib/hbct/ctwin.c diff --git a/harbour/contrib/hbct/ctwin.h b/contrib/hbct/ctwin.h similarity index 100% rename from harbour/contrib/hbct/ctwin.h rename to contrib/hbct/ctwin.h diff --git a/harbour/contrib/hbct/cursor.c b/contrib/hbct/cursor.c similarity index 100% rename from harbour/contrib/hbct/cursor.c rename to contrib/hbct/cursor.c diff --git a/harbour/contrib/hbct/datetime.c b/contrib/hbct/datetime.c similarity index 100% rename from harbour/contrib/hbct/datetime.c rename to contrib/hbct/datetime.c diff --git a/harbour/contrib/hbct/dattime2.c b/contrib/hbct/dattime2.c similarity index 100% rename from harbour/contrib/hbct/dattime2.c rename to contrib/hbct/dattime2.c diff --git a/harbour/contrib/hbct/dattime3.c b/contrib/hbct/dattime3.c similarity index 100% rename from harbour/contrib/hbct/dattime3.c rename to contrib/hbct/dattime3.c diff --git a/harbour/contrib/hbct/dbftools.c b/contrib/hbct/dbftools.c similarity index 100% rename from harbour/contrib/hbct/dbftools.c rename to contrib/hbct/dbftools.c diff --git a/harbour/contrib/hbct/disk.c b/contrib/hbct/disk.c similarity index 100% rename from harbour/contrib/hbct/disk.c rename to contrib/hbct/disk.c diff --git a/harbour/contrib/hbct/doc/en/addascii.txt b/contrib/hbct/doc/en/addascii.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/addascii.txt rename to contrib/hbct/doc/en/addascii.txt diff --git a/harbour/contrib/hbct/doc/en/asciisum.txt b/contrib/hbct/doc/en/asciisum.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/asciisum.txt rename to contrib/hbct/doc/en/asciisum.txt diff --git a/harbour/contrib/hbct/doc/en/ascpos.txt b/contrib/hbct/doc/en/ascpos.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/ascpos.txt rename to contrib/hbct/doc/en/ascpos.txt diff --git a/harbour/contrib/hbct/doc/en/atadjust.txt b/contrib/hbct/doc/en/atadjust.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/atadjust.txt rename to contrib/hbct/doc/en/atadjust.txt diff --git a/harbour/contrib/hbct/doc/en/atnum.txt b/contrib/hbct/doc/en/atnum.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/atnum.txt rename to contrib/hbct/doc/en/atnum.txt diff --git a/harbour/contrib/hbct/doc/en/atrepl.txt b/contrib/hbct/doc/en/atrepl.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/atrepl.txt rename to contrib/hbct/doc/en/atrepl.txt diff --git a/harbour/contrib/hbct/doc/en/charevod.txt b/contrib/hbct/doc/en/charevod.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charevod.txt rename to contrib/hbct/doc/en/charevod.txt diff --git a/harbour/contrib/hbct/doc/en/charlihb.txt b/contrib/hbct/doc/en/charlihb.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charlihb.txt rename to contrib/hbct/doc/en/charlihb.txt diff --git a/harbour/contrib/hbct/doc/en/charlist.txt b/contrib/hbct/doc/en/charlist.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charlist.txt rename to contrib/hbct/doc/en/charlist.txt diff --git a/harbour/contrib/hbct/doc/en/charmirr.txt b/contrib/hbct/doc/en/charmirr.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charmirr.txt rename to contrib/hbct/doc/en/charmirr.txt diff --git a/harbour/contrib/hbct/doc/en/charmix.txt b/contrib/hbct/doc/en/charmix.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charmix.txt rename to contrib/hbct/doc/en/charmix.txt diff --git a/harbour/contrib/hbct/doc/en/charone.txt b/contrib/hbct/doc/en/charone.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charone.txt rename to contrib/hbct/doc/en/charone.txt diff --git a/harbour/contrib/hbct/doc/en/charonly.txt b/contrib/hbct/doc/en/charonly.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charonly.txt rename to contrib/hbct/doc/en/charonly.txt diff --git a/harbour/contrib/hbct/doc/en/charop.txt b/contrib/hbct/doc/en/charop.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charop.txt rename to contrib/hbct/doc/en/charop.txt diff --git a/harbour/contrib/hbct/doc/en/charophb.txt b/contrib/hbct/doc/en/charophb.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charophb.txt rename to contrib/hbct/doc/en/charophb.txt diff --git a/harbour/contrib/hbct/doc/en/charrepl.txt b/contrib/hbct/doc/en/charrepl.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charrepl.txt rename to contrib/hbct/doc/en/charrepl.txt diff --git a/harbour/contrib/hbct/doc/en/charsort.txt b/contrib/hbct/doc/en/charsort.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charsort.txt rename to contrib/hbct/doc/en/charsort.txt diff --git a/harbour/contrib/hbct/doc/en/charswap.txt b/contrib/hbct/doc/en/charswap.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/charswap.txt rename to contrib/hbct/doc/en/charswap.txt diff --git a/harbour/contrib/hbct/doc/en/color.txt b/contrib/hbct/doc/en/color.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/color.txt rename to contrib/hbct/doc/en/color.txt diff --git a/harbour/contrib/hbct/doc/en/count.txt b/contrib/hbct/doc/en/count.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/count.txt rename to contrib/hbct/doc/en/count.txt diff --git a/harbour/contrib/hbct/doc/en/ct.txt b/contrib/hbct/doc/en/ct.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/ct.txt rename to contrib/hbct/doc/en/ct.txt diff --git a/harbour/contrib/hbct/doc/en/ctc.txt b/contrib/hbct/doc/en/ctc.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/ctc.txt rename to contrib/hbct/doc/en/ctc.txt diff --git a/harbour/contrib/hbct/doc/en/ctmath.txt b/contrib/hbct/doc/en/ctmath.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/ctmath.txt rename to contrib/hbct/doc/en/ctmath.txt diff --git a/harbour/contrib/hbct/doc/en/ctmath2.txt b/contrib/hbct/doc/en/ctmath2.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/ctmath2.txt rename to contrib/hbct/doc/en/ctmath2.txt diff --git a/harbour/contrib/hbct/doc/en/ctpad.txt b/contrib/hbct/doc/en/ctpad.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/ctpad.txt rename to contrib/hbct/doc/en/ctpad.txt diff --git a/harbour/contrib/hbct/doc/en/ctstr.txt b/contrib/hbct/doc/en/ctstr.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/ctstr.txt rename to contrib/hbct/doc/en/ctstr.txt diff --git a/harbour/contrib/hbct/doc/en/datetime.txt b/contrib/hbct/doc/en/datetime.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/datetime.txt rename to contrib/hbct/doc/en/datetime.txt diff --git a/harbour/contrib/hbct/doc/en/dattime2.txt b/contrib/hbct/doc/en/dattime2.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/dattime2.txt rename to contrib/hbct/doc/en/dattime2.txt diff --git a/harbour/contrib/hbct/doc/en/dattime3.txt b/contrib/hbct/doc/en/dattime3.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/dattime3.txt rename to contrib/hbct/doc/en/dattime3.txt diff --git a/harbour/contrib/hbct/doc/en/exponent.txt b/contrib/hbct/doc/en/exponent.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/exponent.txt rename to contrib/hbct/doc/en/exponent.txt diff --git a/harbour/contrib/hbct/doc/en/finan.txt b/contrib/hbct/doc/en/finan.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/finan.txt rename to contrib/hbct/doc/en/finan.txt diff --git a/harbour/contrib/hbct/doc/en/ftoc.txt b/contrib/hbct/doc/en/ftoc.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/ftoc.txt rename to contrib/hbct/doc/en/ftoc.txt diff --git a/harbour/contrib/hbct/doc/en/justify.txt b/contrib/hbct/doc/en/justify.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/justify.txt rename to contrib/hbct/doc/en/justify.txt diff --git a/harbour/contrib/hbct/doc/en/keyset.txt b/contrib/hbct/doc/en/keyset.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/keyset.txt rename to contrib/hbct/doc/en/keyset.txt diff --git a/harbour/contrib/hbct/doc/en/misc1.txt b/contrib/hbct/doc/en/misc1.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/misc1.txt rename to contrib/hbct/doc/en/misc1.txt diff --git a/harbour/contrib/hbct/doc/en/num1.txt b/contrib/hbct/doc/en/num1.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/num1.txt rename to contrib/hbct/doc/en/num1.txt diff --git a/harbour/contrib/hbct/doc/en/numat.txt b/contrib/hbct/doc/en/numat.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/numat.txt rename to contrib/hbct/doc/en/numat.txt diff --git a/harbour/contrib/hbct/doc/en/numconv.txt b/contrib/hbct/doc/en/numconv.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/numconv.txt rename to contrib/hbct/doc/en/numconv.txt diff --git a/harbour/contrib/hbct/doc/en/pos1.txt b/contrib/hbct/doc/en/pos1.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/pos1.txt rename to contrib/hbct/doc/en/pos1.txt diff --git a/harbour/contrib/hbct/doc/en/pos2.txt b/contrib/hbct/doc/en/pos2.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/pos2.txt rename to contrib/hbct/doc/en/pos2.txt diff --git a/harbour/contrib/hbct/doc/en/posdiff.txt b/contrib/hbct/doc/en/posdiff.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/posdiff.txt rename to contrib/hbct/doc/en/posdiff.txt diff --git a/harbour/contrib/hbct/doc/en/print.txt b/contrib/hbct/doc/en/print.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/print.txt rename to contrib/hbct/doc/en/print.txt diff --git a/harbour/contrib/hbct/doc/en/range.txt b/contrib/hbct/doc/en/range.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/range.txt rename to contrib/hbct/doc/en/range.txt diff --git a/harbour/contrib/hbct/doc/en/relation.txt b/contrib/hbct/doc/en/relation.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/relation.txt rename to contrib/hbct/doc/en/relation.txt diff --git a/harbour/contrib/hbct/doc/en/remove.txt b/contrib/hbct/doc/en/remove.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/remove.txt rename to contrib/hbct/doc/en/remove.txt diff --git a/harbour/contrib/hbct/doc/en/replace.txt b/contrib/hbct/doc/en/replace.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/replace.txt rename to contrib/hbct/doc/en/replace.txt diff --git a/harbour/contrib/hbct/doc/en/screen1.txt b/contrib/hbct/doc/en/screen1.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/screen1.txt rename to contrib/hbct/doc/en/screen1.txt diff --git a/harbour/contrib/hbct/doc/en/strdiff.txt b/contrib/hbct/doc/en/strdiff.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/strdiff.txt rename to contrib/hbct/doc/en/strdiff.txt diff --git a/harbour/contrib/hbct/doc/en/strswap.txt b/contrib/hbct/doc/en/strswap.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/strswap.txt rename to contrib/hbct/doc/en/strswap.txt diff --git a/harbour/contrib/hbct/doc/en/tab.txt b/contrib/hbct/doc/en/tab.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/tab.txt rename to contrib/hbct/doc/en/tab.txt diff --git a/harbour/contrib/hbct/doc/en/token1.txt b/contrib/hbct/doc/en/token1.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/token1.txt rename to contrib/hbct/doc/en/token1.txt diff --git a/harbour/contrib/hbct/doc/en/token2.txt b/contrib/hbct/doc/en/token2.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/token2.txt rename to contrib/hbct/doc/en/token2.txt diff --git a/harbour/contrib/hbct/doc/en/trig.txt b/contrib/hbct/doc/en/trig.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/trig.txt rename to contrib/hbct/doc/en/trig.txt diff --git a/harbour/contrib/hbct/doc/en/video.txt b/contrib/hbct/doc/en/video.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/video.txt rename to contrib/hbct/doc/en/video.txt diff --git a/harbour/contrib/hbct/doc/en/wordrepl.txt b/contrib/hbct/doc/en/wordrepl.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/wordrepl.txt rename to contrib/hbct/doc/en/wordrepl.txt diff --git a/harbour/contrib/hbct/doc/en/wordtoch.txt b/contrib/hbct/doc/en/wordtoch.txt similarity index 100% rename from harbour/contrib/hbct/doc/en/wordtoch.txt rename to contrib/hbct/doc/en/wordtoch.txt diff --git a/harbour/contrib/hbct/dummy.c b/contrib/hbct/dummy.c similarity index 100% rename from harbour/contrib/hbct/dummy.c rename to contrib/hbct/dummy.c diff --git a/harbour/contrib/hbct/envparam.c b/contrib/hbct/envparam.c similarity index 100% rename from harbour/contrib/hbct/envparam.c rename to contrib/hbct/envparam.c diff --git a/harbour/contrib/hbct/expand.c b/contrib/hbct/expand.c similarity index 100% rename from harbour/contrib/hbct/expand.c rename to contrib/hbct/expand.c diff --git a/harbour/contrib/hbct/exponent.c b/contrib/hbct/exponent.c similarity index 100% rename from harbour/contrib/hbct/exponent.c rename to contrib/hbct/exponent.c diff --git a/harbour/contrib/hbct/fcopy.prg b/contrib/hbct/fcopy.prg similarity index 100% rename from harbour/contrib/hbct/fcopy.prg rename to contrib/hbct/fcopy.prg diff --git a/harbour/contrib/hbct/files.c b/contrib/hbct/files.c similarity index 100% rename from harbour/contrib/hbct/files.c rename to contrib/hbct/files.c diff --git a/harbour/contrib/hbct/finan.c b/contrib/hbct/finan.c similarity index 100% rename from harbour/contrib/hbct/finan.c rename to contrib/hbct/finan.c diff --git a/harbour/contrib/hbct/ftoc.c b/contrib/hbct/ftoc.c similarity index 100% rename from harbour/contrib/hbct/ftoc.c rename to contrib/hbct/ftoc.c diff --git a/harbour/contrib/hbct/getinfo.prg b/contrib/hbct/getinfo.prg similarity index 100% rename from harbour/contrib/hbct/getinfo.prg rename to contrib/hbct/getinfo.prg diff --git a/harbour/contrib/hbct/getinput.prg b/contrib/hbct/getinput.prg similarity index 100% rename from harbour/contrib/hbct/getinput.prg rename to contrib/hbct/getinput.prg diff --git a/harbour/contrib/hbct/getsecrt.prg b/contrib/hbct/getsecrt.prg similarity index 100% rename from harbour/contrib/hbct/getsecrt.prg rename to contrib/hbct/getsecrt.prg diff --git a/harbour/contrib/hbct/hbct.hbc b/contrib/hbct/hbct.hbc similarity index 100% rename from harbour/contrib/hbct/hbct.hbc rename to contrib/hbct/hbct.hbc diff --git a/harbour/contrib/hbct/hbct.hbp b/contrib/hbct/hbct.hbp similarity index 100% rename from harbour/contrib/hbct/hbct.hbp rename to contrib/hbct/hbct.hbp diff --git a/harbour/contrib/hbct/hbct.hbx b/contrib/hbct/hbct.hbx similarity index 100% rename from harbour/contrib/hbct/hbct.hbx rename to contrib/hbct/hbct.hbx diff --git a/harbour/contrib/hbct/justify.c b/contrib/hbct/justify.c similarity index 100% rename from harbour/contrib/hbct/justify.c rename to contrib/hbct/justify.c diff --git a/harbour/contrib/hbct/keysave.prg b/contrib/hbct/keysave.prg similarity index 100% rename from harbour/contrib/hbct/keysave.prg rename to contrib/hbct/keysave.prg diff --git a/harbour/contrib/hbct/keysec.prg b/contrib/hbct/keysec.prg similarity index 100% rename from harbour/contrib/hbct/keysec.prg rename to contrib/hbct/keysec.prg diff --git a/harbour/contrib/hbct/keyset.c b/contrib/hbct/keyset.c similarity index 100% rename from harbour/contrib/hbct/keyset.c rename to contrib/hbct/keyset.c diff --git a/harbour/contrib/hbct/keytime.prg b/contrib/hbct/keytime.prg similarity index 100% rename from harbour/contrib/hbct/keytime.prg rename to contrib/hbct/keytime.prg diff --git a/harbour/contrib/hbct/kxlat.prg b/contrib/hbct/kxlat.prg similarity index 100% rename from harbour/contrib/hbct/kxlat.prg rename to contrib/hbct/kxlat.prg diff --git a/harbour/contrib/hbct/like.c b/contrib/hbct/like.c similarity index 100% rename from harbour/contrib/hbct/like.c rename to contrib/hbct/like.c diff --git a/harbour/contrib/hbct/lton.c b/contrib/hbct/lton.c similarity index 100% rename from harbour/contrib/hbct/lton.c rename to contrib/hbct/lton.c diff --git a/harbour/contrib/hbct/maxline.c b/contrib/hbct/maxline.c similarity index 100% rename from harbour/contrib/hbct/maxline.c rename to contrib/hbct/maxline.c diff --git a/harbour/contrib/hbct/misc1.c b/contrib/hbct/misc1.c similarity index 100% rename from harbour/contrib/hbct/misc1.c rename to contrib/hbct/misc1.c diff --git a/harbour/contrib/hbct/misc2.c b/contrib/hbct/misc2.c similarity index 100% rename from harbour/contrib/hbct/misc2.c rename to contrib/hbct/misc2.c diff --git a/harbour/contrib/hbct/misc3.c b/contrib/hbct/misc3.c similarity index 100% rename from harbour/contrib/hbct/misc3.c rename to contrib/hbct/misc3.c diff --git a/harbour/contrib/hbct/misc4.c b/contrib/hbct/misc4.c similarity index 100% rename from harbour/contrib/hbct/misc4.c rename to contrib/hbct/misc4.c diff --git a/harbour/contrib/hbct/num1.c b/contrib/hbct/num1.c similarity index 100% rename from harbour/contrib/hbct/num1.c rename to contrib/hbct/num1.c diff --git a/harbour/contrib/hbct/numat.c b/contrib/hbct/numat.c similarity index 100% rename from harbour/contrib/hbct/numat.c rename to contrib/hbct/numat.c diff --git a/harbour/contrib/hbct/numbase.c b/contrib/hbct/numbase.c similarity index 100% rename from harbour/contrib/hbct/numbase.c rename to contrib/hbct/numbase.c diff --git a/harbour/contrib/hbct/numcount.c b/contrib/hbct/numcount.c similarity index 100% rename from harbour/contrib/hbct/numcount.c rename to contrib/hbct/numcount.c diff --git a/harbour/contrib/hbct/numline.c b/contrib/hbct/numline.c similarity index 100% rename from harbour/contrib/hbct/numline.c rename to contrib/hbct/numline.c diff --git a/harbour/contrib/hbct/pack.c b/contrib/hbct/pack.c similarity index 100% rename from harbour/contrib/hbct/pack.c rename to contrib/hbct/pack.c diff --git a/harbour/contrib/hbct/pos1.c b/contrib/hbct/pos1.c similarity index 100% rename from harbour/contrib/hbct/pos1.c rename to contrib/hbct/pos1.c diff --git a/harbour/contrib/hbct/pos2.c b/contrib/hbct/pos2.c similarity index 100% rename from harbour/contrib/hbct/pos2.c rename to contrib/hbct/pos2.c diff --git a/harbour/contrib/hbct/posdiff.c b/contrib/hbct/posdiff.c similarity index 100% rename from harbour/contrib/hbct/posdiff.c rename to contrib/hbct/posdiff.c diff --git a/harbour/contrib/hbct/print.c b/contrib/hbct/print.c similarity index 100% rename from harbour/contrib/hbct/print.c rename to contrib/hbct/print.c diff --git a/harbour/contrib/hbct/range.c b/contrib/hbct/range.c similarity index 100% rename from harbour/contrib/hbct/range.c rename to contrib/hbct/range.c diff --git a/harbour/contrib/hbct/readme.txt b/contrib/hbct/readme.txt similarity index 100% rename from harbour/contrib/hbct/readme.txt rename to contrib/hbct/readme.txt diff --git a/harbour/contrib/hbct/relation.c b/contrib/hbct/relation.c similarity index 100% rename from harbour/contrib/hbct/relation.c rename to contrib/hbct/relation.c diff --git a/harbour/contrib/hbct/remove.c b/contrib/hbct/remove.c similarity index 100% rename from harbour/contrib/hbct/remove.c rename to contrib/hbct/remove.c diff --git a/harbour/contrib/hbct/replace.c b/contrib/hbct/replace.c similarity index 100% rename from harbour/contrib/hbct/replace.c rename to contrib/hbct/replace.c diff --git a/harbour/contrib/hbct/screen1.c b/contrib/hbct/screen1.c similarity index 100% rename from harbour/contrib/hbct/screen1.c rename to contrib/hbct/screen1.c diff --git a/harbour/contrib/hbct/screen2.c b/contrib/hbct/screen2.c similarity index 100% rename from harbour/contrib/hbct/screen2.c rename to contrib/hbct/screen2.c diff --git a/harbour/contrib/hbct/screen3.prg b/contrib/hbct/screen3.prg similarity index 100% rename from harbour/contrib/hbct/screen3.prg rename to contrib/hbct/screen3.prg diff --git a/harbour/contrib/hbct/scrmark.prg b/contrib/hbct/scrmark.prg similarity index 100% rename from harbour/contrib/hbct/scrmark.prg rename to contrib/hbct/scrmark.prg diff --git a/harbour/contrib/hbct/setlast.c b/contrib/hbct/setlast.c similarity index 100% rename from harbour/contrib/hbct/setlast.c rename to contrib/hbct/setlast.c diff --git a/harbour/contrib/hbct/setrc.c b/contrib/hbct/setrc.c similarity index 100% rename from harbour/contrib/hbct/setrc.c rename to contrib/hbct/setrc.c diff --git a/harbour/contrib/hbct/showtime.prg b/contrib/hbct/showtime.prg similarity index 100% rename from harbour/contrib/hbct/showtime.prg rename to contrib/hbct/showtime.prg diff --git a/harbour/contrib/hbct/strdiff.c b/contrib/hbct/strdiff.c similarity index 100% rename from harbour/contrib/hbct/strdiff.c rename to contrib/hbct/strdiff.c diff --git a/harbour/contrib/hbct/strswap.c b/contrib/hbct/strswap.c similarity index 100% rename from harbour/contrib/hbct/strswap.c rename to contrib/hbct/strswap.c diff --git a/harbour/contrib/hbct/tab.c b/contrib/hbct/tab.c similarity index 100% rename from harbour/contrib/hbct/tab.c rename to contrib/hbct/tab.c diff --git a/harbour/contrib/hbct/tempfile.prg b/contrib/hbct/tempfile.prg similarity index 100% rename from harbour/contrib/hbct/tempfile.prg rename to contrib/hbct/tempfile.prg diff --git a/harbour/contrib/hbct/tests/addascii.prg b/contrib/hbct/tests/addascii.prg similarity index 100% rename from harbour/contrib/hbct/tests/addascii.prg rename to contrib/hbct/tests/addascii.prg diff --git a/harbour/contrib/hbct/tests/afteratn.prg b/contrib/hbct/tests/afteratn.prg similarity index 100% rename from harbour/contrib/hbct/tests/afteratn.prg rename to contrib/hbct/tests/afteratn.prg diff --git a/harbour/contrib/hbct/tests/asciisum.prg b/contrib/hbct/tests/asciisum.prg similarity index 100% rename from harbour/contrib/hbct/tests/asciisum.prg rename to contrib/hbct/tests/asciisum.prg diff --git a/harbour/contrib/hbct/tests/ascpos.prg b/contrib/hbct/tests/ascpos.prg similarity index 100% rename from harbour/contrib/hbct/tests/ascpos.prg rename to contrib/hbct/tests/ascpos.prg diff --git a/harbour/contrib/hbct/tests/atadjust.prg b/contrib/hbct/tests/atadjust.prg similarity index 100% rename from harbour/contrib/hbct/tests/atadjust.prg rename to contrib/hbct/tests/atadjust.prg diff --git a/harbour/contrib/hbct/tests/atnum.prg b/contrib/hbct/tests/atnum.prg similarity index 100% rename from harbour/contrib/hbct/tests/atnum.prg rename to contrib/hbct/tests/atnum.prg diff --git a/harbour/contrib/hbct/tests/atrepl.prg b/contrib/hbct/tests/atrepl.prg similarity index 100% rename from harbour/contrib/hbct/tests/atrepl.prg rename to contrib/hbct/tests/atrepl.prg diff --git a/harbour/contrib/hbct/tests/attoken.prg b/contrib/hbct/tests/attoken.prg similarity index 100% rename from harbour/contrib/hbct/tests/attoken.prg rename to contrib/hbct/tests/attoken.prg diff --git a/harbour/contrib/hbct/tests/beforatn.prg b/contrib/hbct/tests/beforatn.prg similarity index 100% rename from harbour/contrib/hbct/tests/beforatn.prg rename to contrib/hbct/tests/beforatn.prg diff --git a/harbour/contrib/hbct/tests/charadd.prg b/contrib/hbct/tests/charadd.prg similarity index 100% rename from harbour/contrib/hbct/tests/charadd.prg rename to contrib/hbct/tests/charadd.prg diff --git a/harbour/contrib/hbct/tests/charand.prg b/contrib/hbct/tests/charand.prg similarity index 100% rename from harbour/contrib/hbct/tests/charand.prg rename to contrib/hbct/tests/charand.prg diff --git a/harbour/contrib/hbct/tests/chareven.prg b/contrib/hbct/tests/chareven.prg similarity index 100% rename from harbour/contrib/hbct/tests/chareven.prg rename to contrib/hbct/tests/chareven.prg diff --git a/harbour/contrib/hbct/tests/charhist.prg b/contrib/hbct/tests/charhist.prg similarity index 100% rename from harbour/contrib/hbct/tests/charhist.prg rename to contrib/hbct/tests/charhist.prg diff --git a/harbour/contrib/hbct/tests/charlist.prg b/contrib/hbct/tests/charlist.prg similarity index 100% rename from harbour/contrib/hbct/tests/charlist.prg rename to contrib/hbct/tests/charlist.prg diff --git a/harbour/contrib/hbct/tests/charmirr.prg b/contrib/hbct/tests/charmirr.prg similarity index 100% rename from harbour/contrib/hbct/tests/charmirr.prg rename to contrib/hbct/tests/charmirr.prg diff --git a/harbour/contrib/hbct/tests/charmix.prg b/contrib/hbct/tests/charmix.prg similarity index 100% rename from harbour/contrib/hbct/tests/charmix.prg rename to contrib/hbct/tests/charmix.prg diff --git a/harbour/contrib/hbct/tests/charnlst.prg b/contrib/hbct/tests/charnlst.prg similarity index 100% rename from harbour/contrib/hbct/tests/charnlst.prg rename to contrib/hbct/tests/charnlst.prg diff --git a/harbour/contrib/hbct/tests/charnot.prg b/contrib/hbct/tests/charnot.prg similarity index 100% rename from harbour/contrib/hbct/tests/charnot.prg rename to contrib/hbct/tests/charnot.prg diff --git a/harbour/contrib/hbct/tests/charodd.prg b/contrib/hbct/tests/charodd.prg similarity index 100% rename from harbour/contrib/hbct/tests/charodd.prg rename to contrib/hbct/tests/charodd.prg diff --git a/harbour/contrib/hbct/tests/charone.prg b/contrib/hbct/tests/charone.prg similarity index 100% rename from harbour/contrib/hbct/tests/charone.prg rename to contrib/hbct/tests/charone.prg diff --git a/harbour/contrib/hbct/tests/charonly.prg b/contrib/hbct/tests/charonly.prg similarity index 100% rename from harbour/contrib/hbct/tests/charonly.prg rename to contrib/hbct/tests/charonly.prg diff --git a/harbour/contrib/hbct/tests/charor.prg b/contrib/hbct/tests/charor.prg similarity index 100% rename from harbour/contrib/hbct/tests/charor.prg rename to contrib/hbct/tests/charor.prg diff --git a/harbour/contrib/hbct/tests/charrem.prg b/contrib/hbct/tests/charrem.prg similarity index 100% rename from harbour/contrib/hbct/tests/charrem.prg rename to contrib/hbct/tests/charrem.prg diff --git a/harbour/contrib/hbct/tests/charrepl.prg b/contrib/hbct/tests/charrepl.prg similarity index 100% rename from harbour/contrib/hbct/tests/charrepl.prg rename to contrib/hbct/tests/charrepl.prg diff --git a/harbour/contrib/hbct/tests/charrll.prg b/contrib/hbct/tests/charrll.prg similarity index 100% rename from harbour/contrib/hbct/tests/charrll.prg rename to contrib/hbct/tests/charrll.prg diff --git a/harbour/contrib/hbct/tests/charrlr.prg b/contrib/hbct/tests/charrlr.prg similarity index 100% rename from harbour/contrib/hbct/tests/charrlr.prg rename to contrib/hbct/tests/charrlr.prg diff --git a/harbour/contrib/hbct/tests/charshl.prg b/contrib/hbct/tests/charshl.prg similarity index 100% rename from harbour/contrib/hbct/tests/charshl.prg rename to contrib/hbct/tests/charshl.prg diff --git a/harbour/contrib/hbct/tests/charshr.prg b/contrib/hbct/tests/charshr.prg similarity index 100% rename from harbour/contrib/hbct/tests/charshr.prg rename to contrib/hbct/tests/charshr.prg diff --git a/harbour/contrib/hbct/tests/charslst.prg b/contrib/hbct/tests/charslst.prg similarity index 100% rename from harbour/contrib/hbct/tests/charslst.prg rename to contrib/hbct/tests/charslst.prg diff --git a/harbour/contrib/hbct/tests/charsort.prg b/contrib/hbct/tests/charsort.prg similarity index 100% rename from harbour/contrib/hbct/tests/charsort.prg rename to contrib/hbct/tests/charsort.prg diff --git a/harbour/contrib/hbct/tests/charsub.prg b/contrib/hbct/tests/charsub.prg similarity index 100% rename from harbour/contrib/hbct/tests/charsub.prg rename to contrib/hbct/tests/charsub.prg diff --git a/harbour/contrib/hbct/tests/charswap.prg b/contrib/hbct/tests/charswap.prg similarity index 100% rename from harbour/contrib/hbct/tests/charswap.prg rename to contrib/hbct/tests/charswap.prg diff --git a/harbour/contrib/hbct/tests/charxor.prg b/contrib/hbct/tests/charxor.prg similarity index 100% rename from harbour/contrib/hbct/tests/charxor.prg rename to contrib/hbct/tests/charxor.prg diff --git a/harbour/contrib/hbct/tests/csetarge.prg b/contrib/hbct/tests/csetarge.prg similarity index 100% rename from harbour/contrib/hbct/tests/csetarge.prg rename to contrib/hbct/tests/csetarge.prg diff --git a/harbour/contrib/hbct/tests/csetatmu.prg b/contrib/hbct/tests/csetatmu.prg similarity index 100% rename from harbour/contrib/hbct/tests/csetatmu.prg rename to contrib/hbct/tests/csetatmu.prg diff --git a/harbour/contrib/hbct/tests/csetref.prg b/contrib/hbct/tests/csetref.prg similarity index 100% rename from harbour/contrib/hbct/tests/csetref.prg rename to contrib/hbct/tests/csetref.prg diff --git a/harbour/contrib/hbct/tests/ctwtest.prg b/contrib/hbct/tests/ctwtest.prg similarity index 100% rename from harbour/contrib/hbct/tests/ctwtest.prg rename to contrib/hbct/tests/ctwtest.prg diff --git a/harbour/contrib/hbct/tests/dates4.prg b/contrib/hbct/tests/dates4.prg similarity index 100% rename from harbour/contrib/hbct/tests/dates4.prg rename to contrib/hbct/tests/dates4.prg diff --git a/harbour/contrib/hbct/tests/datetime.prg b/contrib/hbct/tests/datetime.prg similarity index 100% rename from harbour/contrib/hbct/tests/datetime.prg rename to contrib/hbct/tests/datetime.prg diff --git a/harbour/contrib/hbct/tests/expomant.prg b/contrib/hbct/tests/expomant.prg similarity index 100% rename from harbour/contrib/hbct/tests/expomant.prg rename to contrib/hbct/tests/expomant.prg diff --git a/harbour/contrib/hbct/tests/finan.prg b/contrib/hbct/tests/finan.prg similarity index 100% rename from harbour/contrib/hbct/tests/finan.prg rename to contrib/hbct/tests/finan.prg diff --git a/harbour/contrib/hbct/tests/hbmk.hbm b/contrib/hbct/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbct/tests/hbmk.hbm rename to contrib/hbct/tests/hbmk.hbm diff --git a/harbour/contrib/hbct/tests/math.prg b/contrib/hbct/tests/math.prg similarity index 100% rename from harbour/contrib/hbct/tests/math.prg rename to contrib/hbct/tests/math.prg diff --git a/harbour/contrib/hbct/tests/num1.prg b/contrib/hbct/tests/num1.prg similarity index 100% rename from harbour/contrib/hbct/tests/num1.prg rename to contrib/hbct/tests/num1.prg diff --git a/harbour/contrib/hbct/tests/numline.prg b/contrib/hbct/tests/numline.prg similarity index 100% rename from harbour/contrib/hbct/tests/numline.prg rename to contrib/hbct/tests/numline.prg diff --git a/harbour/contrib/hbct/tests/numtoken.prg b/contrib/hbct/tests/numtoken.prg similarity index 100% rename from harbour/contrib/hbct/tests/numtoken.prg rename to contrib/hbct/tests/numtoken.prg diff --git a/harbour/contrib/hbct/tests/rangerem.prg b/contrib/hbct/tests/rangerem.prg similarity index 100% rename from harbour/contrib/hbct/tests/rangerem.prg rename to contrib/hbct/tests/rangerem.prg diff --git a/harbour/contrib/hbct/tests/rangerep.prg b/contrib/hbct/tests/rangerep.prg similarity index 100% rename from harbour/contrib/hbct/tests/rangerep.prg rename to contrib/hbct/tests/rangerep.prg diff --git a/harbour/contrib/hbct/tests/setatlik.prg b/contrib/hbct/tests/setatlik.prg similarity index 100% rename from harbour/contrib/hbct/tests/setatlik.prg rename to contrib/hbct/tests/setatlik.prg diff --git a/harbour/contrib/hbct/tests/strdiff.prg b/contrib/hbct/tests/strdiff.prg similarity index 100% rename from harbour/contrib/hbct/tests/strdiff.prg rename to contrib/hbct/tests/strdiff.prg diff --git a/harbour/contrib/hbct/tests/tab.prg b/contrib/hbct/tests/tab.prg similarity index 100% rename from harbour/contrib/hbct/tests/tab.prg rename to contrib/hbct/tests/tab.prg diff --git a/harbour/contrib/hbct/tests/test.prg b/contrib/hbct/tests/test.prg similarity index 100% rename from harbour/contrib/hbct/tests/test.prg rename to contrib/hbct/tests/test.prg diff --git a/harbour/contrib/hbct/tests/token.prg b/contrib/hbct/tests/token.prg similarity index 100% rename from harbour/contrib/hbct/tests/token.prg rename to contrib/hbct/tests/token.prg diff --git a/harbour/contrib/hbct/tests/token2.prg b/contrib/hbct/tests/token2.prg similarity index 100% rename from harbour/contrib/hbct/tests/token2.prg rename to contrib/hbct/tests/token2.prg diff --git a/harbour/contrib/hbct/tests/tokenlow.prg b/contrib/hbct/tests/tokenlow.prg similarity index 100% rename from harbour/contrib/hbct/tests/tokenlow.prg rename to contrib/hbct/tests/tokenlow.prg diff --git a/harbour/contrib/hbct/tests/tokensep.prg b/contrib/hbct/tests/tokensep.prg similarity index 100% rename from harbour/contrib/hbct/tests/tokensep.prg rename to contrib/hbct/tests/tokensep.prg diff --git a/harbour/contrib/hbct/tests/tokenupp.prg b/contrib/hbct/tests/tokenupp.prg similarity index 100% rename from harbour/contrib/hbct/tests/tokenupp.prg rename to contrib/hbct/tests/tokenupp.prg diff --git a/harbour/contrib/hbct/tests/trig.prg b/contrib/hbct/tests/trig.prg similarity index 100% rename from harbour/contrib/hbct/tests/trig.prg rename to contrib/hbct/tests/trig.prg diff --git a/harbour/contrib/hbct/tests/valpos.prg b/contrib/hbct/tests/valpos.prg similarity index 100% rename from harbour/contrib/hbct/tests/valpos.prg rename to contrib/hbct/tests/valpos.prg diff --git a/harbour/contrib/hbct/tests/wordone.prg b/contrib/hbct/tests/wordone.prg similarity index 100% rename from harbour/contrib/hbct/tests/wordone.prg rename to contrib/hbct/tests/wordone.prg diff --git a/harbour/contrib/hbct/tests/wordonly.prg b/contrib/hbct/tests/wordonly.prg similarity index 100% rename from harbour/contrib/hbct/tests/wordonly.prg rename to contrib/hbct/tests/wordonly.prg diff --git a/harbour/contrib/hbct/tests/wordrem.prg b/contrib/hbct/tests/wordrem.prg similarity index 100% rename from harbour/contrib/hbct/tests/wordrem.prg rename to contrib/hbct/tests/wordrem.prg diff --git a/harbour/contrib/hbct/tests/wordrepl.prg b/contrib/hbct/tests/wordrepl.prg similarity index 100% rename from harbour/contrib/hbct/tests/wordrepl.prg rename to contrib/hbct/tests/wordrepl.prg diff --git a/harbour/contrib/hbct/tests/wordswap.prg b/contrib/hbct/tests/wordswap.prg similarity index 100% rename from harbour/contrib/hbct/tests/wordswap.prg rename to contrib/hbct/tests/wordswap.prg diff --git a/harbour/contrib/hbct/token1.c b/contrib/hbct/token1.c similarity index 100% rename from harbour/contrib/hbct/token1.c rename to contrib/hbct/token1.c diff --git a/harbour/contrib/hbct/token2.c b/contrib/hbct/token2.c similarity index 100% rename from harbour/contrib/hbct/token2.c rename to contrib/hbct/token2.c diff --git a/harbour/contrib/hbct/trig.c b/contrib/hbct/trig.c similarity index 100% rename from harbour/contrib/hbct/trig.c rename to contrib/hbct/trig.c diff --git a/harbour/contrib/hbct/video.c b/contrib/hbct/video.c similarity index 100% rename from harbour/contrib/hbct/video.c rename to contrib/hbct/video.c diff --git a/harbour/contrib/hbct/wordrepl.c b/contrib/hbct/wordrepl.c similarity index 100% rename from harbour/contrib/hbct/wordrepl.c rename to contrib/hbct/wordrepl.c diff --git a/harbour/contrib/hbct/wordtoch.c b/contrib/hbct/wordtoch.c similarity index 100% rename from harbour/contrib/hbct/wordtoch.c rename to contrib/hbct/wordtoch.c diff --git a/harbour/contrib/hbcups/core.c b/contrib/hbcups/core.c similarity index 100% rename from harbour/contrib/hbcups/core.c rename to contrib/hbcups/core.c diff --git a/harbour/contrib/hbcups/hbcups.hbc b/contrib/hbcups/hbcups.hbc similarity index 100% rename from harbour/contrib/hbcups/hbcups.hbc rename to contrib/hbcups/hbcups.hbc diff --git a/harbour/contrib/hbcups/hbcups.hbp b/contrib/hbcups/hbcups.hbp similarity index 100% rename from harbour/contrib/hbcups/hbcups.hbp rename to contrib/hbcups/hbcups.hbp diff --git a/harbour/contrib/hbcups/hbcups.hbx b/contrib/hbcups/hbcups.hbx similarity index 100% rename from harbour/contrib/hbcups/hbcups.hbx rename to contrib/hbcups/hbcups.hbx diff --git a/harbour/contrib/hbcups/readme.txt b/contrib/hbcups/readme.txt similarity index 100% rename from harbour/contrib/hbcups/readme.txt rename to contrib/hbcups/readme.txt diff --git a/harbour/contrib/hbcups/tests/hbmk.hbm b/contrib/hbcups/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbcups/tests/hbmk.hbm rename to contrib/hbcups/tests/hbmk.hbm diff --git a/harbour/contrib/hbcups/tests/test.prg b/contrib/hbcups/tests/test.prg similarity index 100% rename from harbour/contrib/hbcups/tests/test.prg rename to contrib/hbcups/tests/test.prg diff --git a/harbour/contrib/hbcurl/core.c b/contrib/hbcurl/core.c similarity index 100% rename from harbour/contrib/hbcurl/core.c rename to contrib/hbcurl/core.c diff --git a/harbour/contrib/hbcurl/hbcurl.ch b/contrib/hbcurl/hbcurl.ch similarity index 100% rename from harbour/contrib/hbcurl/hbcurl.ch rename to contrib/hbcurl/hbcurl.ch diff --git a/harbour/contrib/hbcurl/hbcurl.hbc b/contrib/hbcurl/hbcurl.hbc similarity index 100% rename from harbour/contrib/hbcurl/hbcurl.hbc rename to contrib/hbcurl/hbcurl.hbc diff --git a/harbour/contrib/hbcurl/hbcurl.hbm b/contrib/hbcurl/hbcurl.hbm similarity index 100% rename from harbour/contrib/hbcurl/hbcurl.hbm rename to contrib/hbcurl/hbcurl.hbm diff --git a/harbour/contrib/hbcurl/hbcurl.hbp b/contrib/hbcurl/hbcurl.hbp similarity index 100% rename from harbour/contrib/hbcurl/hbcurl.hbp rename to contrib/hbcurl/hbcurl.hbp diff --git a/harbour/contrib/hbcurl/hbcurl.hbx b/contrib/hbcurl/hbcurl.hbx similarity index 100% rename from harbour/contrib/hbcurl/hbcurl.hbx rename to contrib/hbcurl/hbcurl.hbx diff --git a/harbour/contrib/hbcurl/hbcurls.hbp b/contrib/hbcurl/hbcurls.hbp similarity index 100% rename from harbour/contrib/hbcurl/hbcurls.hbp rename to contrib/hbcurl/hbcurls.hbp diff --git a/harbour/contrib/hbcurl/tests/ftp_uldl.prg b/contrib/hbcurl/tests/ftp_uldl.prg similarity index 100% rename from harbour/contrib/hbcurl/tests/ftp_uldl.prg rename to contrib/hbcurl/tests/ftp_uldl.prg diff --git a/harbour/contrib/hbcurl/tests/hbmk.hbm b/contrib/hbcurl/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbcurl/tests/hbmk.hbm rename to contrib/hbcurl/tests/hbmk.hbm diff --git a/harbour/contrib/hbexpat/3rd/expat/COPYING b/contrib/hbexpat/3rd/expat/COPYING similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/COPYING rename to contrib/hbexpat/3rd/expat/COPYING diff --git a/harbour/contrib/hbexpat/3rd/expat/_hbconf.h b/contrib/hbexpat/3rd/expat/_hbconf.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/_hbconf.h rename to contrib/hbexpat/3rd/expat/_hbconf.h diff --git a/harbour/contrib/hbexpat/3rd/expat/amigacon.h b/contrib/hbexpat/3rd/expat/amigacon.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/amigacon.h rename to contrib/hbexpat/3rd/expat/amigacon.h diff --git a/harbour/contrib/hbexpat/3rd/expat/ascii.h b/contrib/hbexpat/3rd/expat/ascii.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/ascii.h rename to contrib/hbexpat/3rd/expat/ascii.h diff --git a/harbour/contrib/hbexpat/3rd/expat/asciitab.h b/contrib/hbexpat/3rd/expat/asciitab.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/asciitab.h rename to contrib/hbexpat/3rd/expat/asciitab.h diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.dif b/contrib/hbexpat/3rd/expat/expat.dif similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/expat.dif rename to contrib/hbexpat/3rd/expat/expat.dif diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.h b/contrib/hbexpat/3rd/expat/expat.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/expat.h rename to contrib/hbexpat/3rd/expat/expat.h diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.hbc b/contrib/hbexpat/3rd/expat/expat.hbc similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/expat.hbc rename to contrib/hbexpat/3rd/expat/expat.hbc diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.hbp b/contrib/hbexpat/3rd/expat/expat.hbp similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/expat.hbp rename to contrib/hbexpat/3rd/expat/expat.hbp diff --git a/harbour/contrib/hbexpat/3rd/expat/expat_ex.h b/contrib/hbexpat/3rd/expat/expat_ex.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/expat_ex.h rename to contrib/hbexpat/3rd/expat/expat_ex.h diff --git a/harbour/contrib/hbexpat/3rd/expat/iasciita.h b/contrib/hbexpat/3rd/expat/iasciita.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/iasciita.h rename to contrib/hbexpat/3rd/expat/iasciita.h diff --git a/harbour/contrib/hbexpat/3rd/expat/internal.h b/contrib/hbexpat/3rd/expat/internal.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/internal.h rename to contrib/hbexpat/3rd/expat/internal.h diff --git a/harbour/contrib/hbexpat/3rd/expat/latin1ta.h b/contrib/hbexpat/3rd/expat/latin1ta.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/latin1ta.h rename to contrib/hbexpat/3rd/expat/latin1ta.h diff --git a/harbour/contrib/hbexpat/3rd/expat/macconfi.h b/contrib/hbexpat/3rd/expat/macconfi.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/macconfi.h rename to contrib/hbexpat/3rd/expat/macconfi.h diff --git a/harbour/contrib/hbexpat/3rd/expat/nametab.h b/contrib/hbexpat/3rd/expat/nametab.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/nametab.h rename to contrib/hbexpat/3rd/expat/nametab.h diff --git a/harbour/contrib/hbexpat/3rd/expat/utf8tab.h b/contrib/hbexpat/3rd/expat/utf8tab.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/utf8tab.h rename to contrib/hbexpat/3rd/expat/utf8tab.h diff --git a/harbour/contrib/hbexpat/3rd/expat/winconfi.h b/contrib/hbexpat/3rd/expat/winconfi.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/winconfi.h rename to contrib/hbexpat/3rd/expat/winconfi.h diff --git a/harbour/contrib/hbexpat/3rd/expat/xmlparse.c b/contrib/hbexpat/3rd/expat/xmlparse.c similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/xmlparse.c rename to contrib/hbexpat/3rd/expat/xmlparse.c diff --git a/harbour/contrib/hbexpat/3rd/expat/xmlrole.c b/contrib/hbexpat/3rd/expat/xmlrole.c similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/xmlrole.c rename to contrib/hbexpat/3rd/expat/xmlrole.c diff --git a/harbour/contrib/hbexpat/3rd/expat/xmlrole.h b/contrib/hbexpat/3rd/expat/xmlrole.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/xmlrole.h rename to contrib/hbexpat/3rd/expat/xmlrole.h diff --git a/harbour/contrib/hbexpat/3rd/expat/xmltok.c b/contrib/hbexpat/3rd/expat/xmltok.c similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/xmltok.c rename to contrib/hbexpat/3rd/expat/xmltok.c diff --git a/harbour/contrib/hbexpat/3rd/expat/xmltok.h b/contrib/hbexpat/3rd/expat/xmltok.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/xmltok.h rename to contrib/hbexpat/3rd/expat/xmltok.h diff --git a/harbour/contrib/hbexpat/3rd/expat/xmltok_i.c b/contrib/hbexpat/3rd/expat/xmltok_i.c similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/xmltok_i.c rename to contrib/hbexpat/3rd/expat/xmltok_i.c diff --git a/harbour/contrib/hbexpat/3rd/expat/xmltok_i.h b/contrib/hbexpat/3rd/expat/xmltok_i.h similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/xmltok_i.h rename to contrib/hbexpat/3rd/expat/xmltok_i.h diff --git a/harbour/contrib/hbexpat/3rd/expat/xmltok_n.c b/contrib/hbexpat/3rd/expat/xmltok_n.c similarity index 100% rename from harbour/contrib/hbexpat/3rd/expat/xmltok_n.c rename to contrib/hbexpat/3rd/expat/xmltok_n.c diff --git a/harbour/contrib/hbexpat/core.c b/contrib/hbexpat/core.c similarity index 100% rename from harbour/contrib/hbexpat/core.c rename to contrib/hbexpat/core.c diff --git a/harbour/contrib/hbexpat/hbexpat.ch b/contrib/hbexpat/hbexpat.ch similarity index 100% rename from harbour/contrib/hbexpat/hbexpat.ch rename to contrib/hbexpat/hbexpat.ch diff --git a/harbour/contrib/hbexpat/hbexpat.hbc b/contrib/hbexpat/hbexpat.hbc similarity index 100% rename from harbour/contrib/hbexpat/hbexpat.hbc rename to contrib/hbexpat/hbexpat.hbc diff --git a/harbour/contrib/hbexpat/hbexpat.hbp b/contrib/hbexpat/hbexpat.hbp similarity index 100% rename from harbour/contrib/hbexpat/hbexpat.hbp rename to contrib/hbexpat/hbexpat.hbp diff --git a/harbour/contrib/hbexpat/hbexpat.hbx b/contrib/hbexpat/hbexpat.hbx similarity index 100% rename from harbour/contrib/hbexpat/hbexpat.hbx rename to contrib/hbexpat/hbexpat.hbx diff --git a/harbour/contrib/hbexpat/internal.c b/contrib/hbexpat/internal.c similarity index 100% rename from harbour/contrib/hbexpat/internal.c rename to contrib/hbexpat/internal.c diff --git a/harbour/contrib/hbexpat/tests/hbmk.hbm b/contrib/hbexpat/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbexpat/tests/hbmk.hbm rename to contrib/hbexpat/tests/hbmk.hbm diff --git a/harbour/contrib/hbexpat/tests/test.prg b/contrib/hbexpat/tests/test.prg similarity index 100% rename from harbour/contrib/hbexpat/tests/test.prg rename to contrib/hbexpat/tests/test.prg diff --git a/harbour/contrib/hbexpat/tests/test.xml b/contrib/hbexpat/tests/test.xml similarity index 100% rename from harbour/contrib/hbexpat/tests/test.xml rename to contrib/hbexpat/tests/test.xml diff --git a/harbour/contrib/hbexpat/tests/tohash.prg b/contrib/hbexpat/tests/tohash.prg similarity index 100% rename from harbour/contrib/hbexpat/tests/tohash.prg rename to contrib/hbexpat/tests/tohash.prg diff --git a/harbour/contrib/hbexpat/unitable.prg b/contrib/hbexpat/unitable.prg similarity index 100% rename from harbour/contrib/hbexpat/unitable.prg rename to contrib/hbexpat/unitable.prg diff --git a/harbour/contrib/hbfbird/firebird.c b/contrib/hbfbird/firebird.c similarity index 100% rename from harbour/contrib/hbfbird/firebird.c rename to contrib/hbfbird/firebird.c diff --git a/harbour/contrib/hbfbird/hbfbird.hbc b/contrib/hbfbird/hbfbird.hbc similarity index 100% rename from harbour/contrib/hbfbird/hbfbird.hbc rename to contrib/hbfbird/hbfbird.hbc diff --git a/harbour/contrib/hbfbird/hbfbird.hbp b/contrib/hbfbird/hbfbird.hbp similarity index 100% rename from harbour/contrib/hbfbird/hbfbird.hbp rename to contrib/hbfbird/hbfbird.hbp diff --git a/harbour/contrib/hbfbird/hbfbird.hbx b/contrib/hbfbird/hbfbird.hbx similarity index 100% rename from harbour/contrib/hbfbird/hbfbird.hbx rename to contrib/hbfbird/hbfbird.hbx diff --git a/harbour/contrib/hbfbird/readme.txt b/contrib/hbfbird/readme.txt similarity index 100% rename from harbour/contrib/hbfbird/readme.txt rename to contrib/hbfbird/readme.txt diff --git a/harbour/contrib/hbfbird/tests/hbmk.hbm b/contrib/hbfbird/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbfbird/tests/hbmk.hbm rename to contrib/hbfbird/tests/hbmk.hbm diff --git a/harbour/contrib/hbfbird/tests/simple.prg b/contrib/hbfbird/tests/simple.prg similarity index 100% rename from harbour/contrib/hbfbird/tests/simple.prg rename to contrib/hbfbird/tests/simple.prg diff --git a/harbour/contrib/hbfbird/tests/stress.prg b/contrib/hbfbird/tests/stress.prg similarity index 100% rename from harbour/contrib/hbfbird/tests/stress.prg rename to contrib/hbfbird/tests/stress.prg diff --git a/harbour/contrib/hbfbird/tests/test.prg b/contrib/hbfbird/tests/test.prg similarity index 100% rename from harbour/contrib/hbfbird/tests/test.prg rename to contrib/hbfbird/tests/test.prg diff --git a/harbour/contrib/hbfbird/tests/testapi.c b/contrib/hbfbird/tests/testapi.c similarity index 100% rename from harbour/contrib/hbfbird/tests/testapi.c rename to contrib/hbfbird/tests/testapi.c diff --git a/harbour/contrib/hbfbird/tfirebrd.prg b/contrib/hbfbird/tfirebrd.prg similarity index 100% rename from harbour/contrib/hbfbird/tfirebrd.prg rename to contrib/hbfbird/tfirebrd.prg diff --git a/harbour/contrib/hbfimage/fi_wrp.c b/contrib/hbfimage/fi_wrp.c similarity index 100% rename from harbour/contrib/hbfimage/fi_wrp.c rename to contrib/hbfimage/fi_wrp.c diff --git a/harbour/contrib/hbfimage/freeimag.ch b/contrib/hbfimage/freeimag.ch similarity index 100% rename from harbour/contrib/hbfimage/freeimag.ch rename to contrib/hbfimage/freeimag.ch diff --git a/harbour/contrib/hbfimage/hbfimage.hbc b/contrib/hbfimage/hbfimage.hbc similarity index 100% rename from harbour/contrib/hbfimage/hbfimage.hbc rename to contrib/hbfimage/hbfimage.hbc diff --git a/harbour/contrib/hbfimage/hbfimage.hbp b/contrib/hbfimage/hbfimage.hbp similarity index 100% rename from harbour/contrib/hbfimage/hbfimage.hbp rename to contrib/hbfimage/hbfimage.hbp diff --git a/harbour/contrib/hbfimage/hbfimage.hbx b/contrib/hbfimage/hbfimage.hbx similarity index 100% rename from harbour/contrib/hbfimage/hbfimage.hbx rename to contrib/hbfimage/hbfimage.hbx diff --git a/harbour/contrib/hbfimage/readme.txt b/contrib/hbfimage/readme.txt similarity index 100% rename from harbour/contrib/hbfimage/readme.txt rename to contrib/hbfimage/readme.txt diff --git a/harbour/contrib/hbfimage/tests/fsg.jpg b/contrib/hbfimage/tests/fsg.jpg similarity index 100% rename from harbour/contrib/hbfimage/tests/fsg.jpg rename to contrib/hbfimage/tests/fsg.jpg diff --git a/harbour/contrib/hbfimage/tests/hbmk.hbm b/contrib/hbfimage/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbfimage/tests/hbmk.hbm rename to contrib/hbfimage/tests/hbmk.hbm diff --git a/harbour/contrib/hbfimage/tests/italia.gif b/contrib/hbfimage/tests/italia.gif similarity index 100% rename from harbour/contrib/hbfimage/tests/italia.gif rename to contrib/hbfimage/tests/italia.gif diff --git a/harbour/contrib/hbfimage/tests/sample1.jpg b/contrib/hbfimage/tests/sample1.jpg similarity index 100% rename from harbour/contrib/hbfimage/tests/sample1.jpg rename to contrib/hbfimage/tests/sample1.jpg diff --git a/harbour/contrib/hbfimage/tests/test.prg b/contrib/hbfimage/tests/test.prg similarity index 100% rename from harbour/contrib/hbfimage/tests/test.prg rename to contrib/hbfimage/tests/test.prg diff --git a/harbour/contrib/hbformat/hbfmtcls.prg b/contrib/hbformat/hbfmtcls.prg similarity index 100% rename from harbour/contrib/hbformat/hbfmtcls.prg rename to contrib/hbformat/hbfmtcls.prg diff --git a/harbour/contrib/hbformat/hbformat.hbc b/contrib/hbformat/hbformat.hbc similarity index 100% rename from harbour/contrib/hbformat/hbformat.hbc rename to contrib/hbformat/hbformat.hbc diff --git a/harbour/contrib/hbformat/hbformat.hbp b/contrib/hbformat/hbformat.hbp similarity index 100% rename from harbour/contrib/hbformat/hbformat.hbp rename to contrib/hbformat/hbformat.hbp diff --git a/harbour/contrib/hbformat/hbformat.hbx b/contrib/hbformat/hbformat.hbx similarity index 100% rename from harbour/contrib/hbformat/hbformat.hbx rename to contrib/hbformat/hbformat.hbx diff --git a/harbour/contrib/hbformat/hbfuncs.prg b/contrib/hbformat/hbfuncs.prg similarity index 100% rename from harbour/contrib/hbformat/hbfuncs.prg rename to contrib/hbformat/hbfuncs.prg diff --git a/harbour/contrib/hbformat/utils/hbformat.hbp b/contrib/hbformat/utils/hbformat.hbp similarity index 100% rename from harbour/contrib/hbformat/utils/hbformat.hbp rename to contrib/hbformat/utils/hbformat.hbp diff --git a/harbour/contrib/hbformat/utils/hbformat.ini b/contrib/hbformat/utils/hbformat.ini similarity index 100% rename from harbour/contrib/hbformat/utils/hbformat.ini rename to contrib/hbformat/utils/hbformat.ini diff --git a/harbour/contrib/hbformat/utils/hbformat.prg b/contrib/hbformat/utils/hbformat.prg similarity index 100% rename from harbour/contrib/hbformat/utils/hbformat.prg rename to contrib/hbformat/utils/hbformat.prg diff --git a/harbour/contrib/hbfoxpro/dll.prg b/contrib/hbfoxpro/dll.prg similarity index 100% rename from harbour/contrib/hbfoxpro/dll.prg rename to contrib/hbfoxpro/dll.prg diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.ch b/contrib/hbfoxpro/hbfoxpro.ch similarity index 100% rename from harbour/contrib/hbfoxpro/hbfoxpro.ch rename to contrib/hbfoxpro/hbfoxpro.ch diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.hbc b/contrib/hbfoxpro/hbfoxpro.hbc similarity index 100% rename from harbour/contrib/hbfoxpro/hbfoxpro.hbc rename to contrib/hbfoxpro/hbfoxpro.hbc diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.hbp b/contrib/hbfoxpro/hbfoxpro.hbp similarity index 100% rename from harbour/contrib/hbfoxpro/hbfoxpro.hbp rename to contrib/hbfoxpro/hbfoxpro.hbp diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.hbx b/contrib/hbfoxpro/hbfoxpro.hbx similarity index 100% rename from harbour/contrib/hbfoxpro/hbfoxpro.hbx rename to contrib/hbfoxpro/hbfoxpro.hbx diff --git a/harbour/contrib/hbfoxpro/misc.prg b/contrib/hbfoxpro/misc.prg similarity index 100% rename from harbour/contrib/hbfoxpro/misc.prg rename to contrib/hbfoxpro/misc.prg diff --git a/harbour/contrib/hbfship/dbsetloc.c b/contrib/hbfship/dbsetloc.c similarity index 100% rename from harbour/contrib/hbfship/dbsetloc.c rename to contrib/hbfship/dbsetloc.c diff --git a/harbour/contrib/hbfship/exec.c b/contrib/hbfship/exec.c similarity index 100% rename from harbour/contrib/hbfship/exec.c rename to contrib/hbfship/exec.c diff --git a/harbour/contrib/hbfship/fldarr.prg b/contrib/hbfship/fldarr.prg similarity index 100% rename from harbour/contrib/hbfship/fldarr.prg rename to contrib/hbfship/fldarr.prg diff --git a/harbour/contrib/hbfship/flddeci.c b/contrib/hbfship/flddeci.c similarity index 100% rename from harbour/contrib/hbfship/flddeci.c rename to contrib/hbfship/flddeci.c diff --git a/harbour/contrib/hbfship/hbfship.hbc b/contrib/hbfship/hbfship.hbc similarity index 100% rename from harbour/contrib/hbfship/hbfship.hbc rename to contrib/hbfship/hbfship.hbc diff --git a/harbour/contrib/hbfship/hbfship.hbp b/contrib/hbfship/hbfship.hbp similarity index 100% rename from harbour/contrib/hbfship/hbfship.hbp rename to contrib/hbfship/hbfship.hbp diff --git a/harbour/contrib/hbfship/hbfship.hbx b/contrib/hbfship/hbfship.hbx similarity index 100% rename from harbour/contrib/hbfship/hbfship.hbx rename to contrib/hbfship/hbfship.hbx diff --git a/harbour/contrib/hbfship/index.c b/contrib/hbfship/index.c similarity index 100% rename from harbour/contrib/hbfship/index.c rename to contrib/hbfship/index.c diff --git a/harbour/contrib/hbfship/isbegseq.c b/contrib/hbfship/isbegseq.c similarity index 100% rename from harbour/contrib/hbfship/isbegseq.c rename to contrib/hbfship/isbegseq.c diff --git a/harbour/contrib/hbfship/isdb.prg b/contrib/hbfship/isdb.prg similarity index 100% rename from harbour/contrib/hbfship/isdb.prg rename to contrib/hbfship/isdb.prg diff --git a/harbour/contrib/hbfship/isfunc.c b/contrib/hbfship/isfunc.c similarity index 100% rename from harbour/contrib/hbfship/isfunc.c rename to contrib/hbfship/isfunc.c diff --git a/harbour/contrib/hbfship/secondfs.c b/contrib/hbfship/secondfs.c similarity index 100% rename from harbour/contrib/hbfship/secondfs.c rename to contrib/hbfship/secondfs.c diff --git a/harbour/contrib/hbfship/strpeek.c b/contrib/hbfship/strpeek.c similarity index 100% rename from harbour/contrib/hbfship/strpeek.c rename to contrib/hbfship/strpeek.c diff --git a/harbour/contrib/hbfship/users.c b/contrib/hbfship/users.c similarity index 100% rename from harbour/contrib/hbfship/users.c rename to contrib/hbfship/users.c diff --git a/harbour/contrib/hbgd/doc/en/hbgd.txt b/contrib/hbgd/doc/en/hbgd.txt similarity index 100% rename from harbour/contrib/hbgd/doc/en/hbgd.txt rename to contrib/hbgd/doc/en/hbgd.txt diff --git a/harbour/contrib/hbgd/gd.ch b/contrib/hbgd/gd.ch similarity index 100% rename from harbour/contrib/hbgd/gd.ch rename to contrib/hbgd/gd.ch diff --git a/harbour/contrib/hbgd/gd.prg b/contrib/hbgd/gd.prg similarity index 100% rename from harbour/contrib/hbgd/gd.prg rename to contrib/hbgd/gd.prg diff --git a/harbour/contrib/hbgd/gdbar.prg b/contrib/hbgd/gdbar.prg similarity index 100% rename from harbour/contrib/hbgd/gdbar.prg rename to contrib/hbgd/gdbar.prg diff --git a/harbour/contrib/hbgd/gdbarcod.prg b/contrib/hbgd/gdbarcod.prg similarity index 100% rename from harbour/contrib/hbgd/gdbarcod.prg rename to contrib/hbgd/gdbarcod.prg diff --git a/harbour/contrib/hbgd/gdchart.prg b/contrib/hbgd/gdchart.prg similarity index 100% rename from harbour/contrib/hbgd/gdchart.prg rename to contrib/hbgd/gdchart.prg diff --git a/harbour/contrib/hbgd/gdimage.prg b/contrib/hbgd/gdimage.prg similarity index 100% rename from harbour/contrib/hbgd/gdimage.prg rename to contrib/hbgd/gdimage.prg diff --git a/harbour/contrib/hbgd/gdwrp.c b/contrib/hbgd/gdwrp.c similarity index 100% rename from harbour/contrib/hbgd/gdwrp.c rename to contrib/hbgd/gdwrp.c diff --git a/harbour/contrib/hbgd/hbgd.hbc b/contrib/hbgd/hbgd.hbc similarity index 100% rename from harbour/contrib/hbgd/hbgd.hbc rename to contrib/hbgd/hbgd.hbc diff --git a/harbour/contrib/hbgd/hbgd.hbp b/contrib/hbgd/hbgd.hbp similarity index 100% rename from harbour/contrib/hbgd/hbgd.hbp rename to contrib/hbgd/hbgd.hbp diff --git a/harbour/contrib/hbgd/hbgd.hbx b/contrib/hbgd/hbgd.hbx similarity index 100% rename from harbour/contrib/hbgd/hbgd.hbx rename to contrib/hbgd/hbgd.hbx diff --git a/harbour/contrib/hbgd/tests/animgif.prg b/contrib/hbgd/tests/animgif.prg similarity index 100% rename from harbour/contrib/hbgd/tests/animgif.prg rename to contrib/hbgd/tests/animgif.prg diff --git a/harbour/contrib/hbgd/tests/antialia.prg b/contrib/hbgd/tests/antialia.prg similarity index 100% rename from harbour/contrib/hbgd/tests/antialia.prg rename to contrib/hbgd/tests/antialia.prg diff --git a/harbour/contrib/hbgd/tests/barcode.prg b/contrib/hbgd/tests/barcode.prg similarity index 100% rename from harbour/contrib/hbgd/tests/barcode.prg rename to contrib/hbgd/tests/barcode.prg diff --git a/harbour/contrib/hbgd/tests/barcode2.prg b/contrib/hbgd/tests/barcode2.prg similarity index 100% rename from harbour/contrib/hbgd/tests/barcode2.prg rename to contrib/hbgd/tests/barcode2.prg diff --git a/harbour/contrib/hbgd/tests/cgi.prg b/contrib/hbgd/tests/cgi.prg similarity index 100% rename from harbour/contrib/hbgd/tests/cgi.prg rename to contrib/hbgd/tests/cgi.prg diff --git a/harbour/contrib/hbgd/tests/counter.prg b/contrib/hbgd/tests/counter.prg similarity index 100% rename from harbour/contrib/hbgd/tests/counter.prg rename to contrib/hbgd/tests/counter.prg diff --git a/harbour/contrib/hbgd/tests/digits/57chevy.gif b/contrib/hbgd/tests/digits/57chevy.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/57chevy.gif rename to contrib/hbgd/tests/digits/57chevy.gif diff --git a/harbour/contrib/hbgd/tests/digits/7seg.gif b/contrib/hbgd/tests/digits/7seg.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/7seg.gif rename to contrib/hbgd/tests/digits/7seg.gif diff --git a/harbour/contrib/hbgd/tests/digits/brsd.gif b/contrib/hbgd/tests/digits/brsd.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/brsd.gif rename to contrib/hbgd/tests/digits/brsd.gif diff --git a/harbour/contrib/hbgd/tests/digits/digib.gif b/contrib/hbgd/tests/digits/digib.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/digib.gif rename to contrib/hbgd/tests/digits/digib.gif diff --git a/harbour/contrib/hbgd/tests/digits/fdb.gif b/contrib/hbgd/tests/digits/fdb.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/fdb.gif rename to contrib/hbgd/tests/digits/fdb.gif diff --git a/harbour/contrib/hbgd/tests/digits/jelly.gif b/contrib/hbgd/tests/digits/jelly.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/jelly.gif rename to contrib/hbgd/tests/digits/jelly.gif diff --git a/harbour/contrib/hbgd/tests/digits/odb.gif b/contrib/hbgd/tests/digits/odb.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/odb.gif rename to contrib/hbgd/tests/digits/odb.gif diff --git a/harbour/contrib/hbgd/tests/digits/odw.gif b/contrib/hbgd/tests/digits/odw.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/odw.gif rename to contrib/hbgd/tests/digits/odw.gif diff --git a/harbour/contrib/hbgd/tests/digits/pdg.gif b/contrib/hbgd/tests/digits/pdg.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/pdg.gif rename to contrib/hbgd/tests/digits/pdg.gif diff --git a/harbour/contrib/hbgd/tests/digits/pdw.gif b/contrib/hbgd/tests/digits/pdw.gif similarity index 100% rename from harbour/contrib/hbgd/tests/digits/pdw.gif rename to contrib/hbgd/tests/digits/pdw.gif diff --git a/harbour/contrib/hbgd/tests/fontdpi.prg b/contrib/hbgd/tests/fontdpi.prg similarity index 100% rename from harbour/contrib/hbgd/tests/fontdpi.prg rename to contrib/hbgd/tests/fontdpi.prg diff --git a/harbour/contrib/hbgd/tests/gdapi.prg b/contrib/hbgd/tests/gdapi.prg similarity index 100% rename from harbour/contrib/hbgd/tests/gdapi.prg rename to contrib/hbgd/tests/gdapi.prg diff --git a/harbour/contrib/hbgd/tests/gdclass.prg b/contrib/hbgd/tests/gdclass.prg similarity index 100% rename from harbour/contrib/hbgd/tests/gdclass.prg rename to contrib/hbgd/tests/gdclass.prg diff --git a/harbour/contrib/hbgd/tests/hbmk.hbm b/contrib/hbgd/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbgd/tests/hbmk.hbm rename to contrib/hbgd/tests/hbmk.hbm diff --git a/harbour/contrib/hbgd/tests/imgs_in/conv_tst.jpg b/contrib/hbgd/tests/imgs_in/conv_tst.jpg similarity index 100% rename from harbour/contrib/hbgd/tests/imgs_in/conv_tst.jpg rename to contrib/hbgd/tests/imgs_in/conv_tst.jpg diff --git a/harbour/contrib/hbgd/tests/imgs_in/gdlogo.png b/contrib/hbgd/tests/imgs_in/gdlogo.png similarity index 100% rename from harbour/contrib/hbgd/tests/imgs_in/gdlogo.png rename to contrib/hbgd/tests/imgs_in/gdlogo.png diff --git a/harbour/contrib/hbgd/tests/imgs_in/harbour.gif b/contrib/hbgd/tests/imgs_in/harbour.gif similarity index 100% rename from harbour/contrib/hbgd/tests/imgs_in/harbour.gif rename to contrib/hbgd/tests/imgs_in/harbour.gif diff --git a/harbour/contrib/hbgd/tests/test.prg b/contrib/hbgd/tests/test.prg similarity index 100% rename from harbour/contrib/hbgd/tests/test.prg rename to contrib/hbgd/tests/test.prg diff --git a/harbour/contrib/hbgd/tests/tostring.prg b/contrib/hbgd/tests/tostring.prg similarity index 100% rename from harbour/contrib/hbgd/tests/tostring.prg rename to contrib/hbgd/tests/tostring.prg diff --git a/harbour/contrib/hbgd/tests/tpoly.prg b/contrib/hbgd/tests/tpoly.prg similarity index 100% rename from harbour/contrib/hbgd/tests/tpoly.prg rename to contrib/hbgd/tests/tpoly.prg diff --git a/harbour/contrib/hbgs/core.c b/contrib/hbgs/core.c similarity index 100% rename from harbour/contrib/hbgs/core.c rename to contrib/hbgs/core.c diff --git a/harbour/contrib/hbgs/hbgs.hbc b/contrib/hbgs/hbgs.hbc similarity index 100% rename from harbour/contrib/hbgs/hbgs.hbc rename to contrib/hbgs/hbgs.hbc diff --git a/harbour/contrib/hbgs/hbgs.hbp b/contrib/hbgs/hbgs.hbp similarity index 100% rename from harbour/contrib/hbgs/hbgs.hbp rename to contrib/hbgs/hbgs.hbp diff --git a/harbour/contrib/hbgs/hbgs.hbx b/contrib/hbgs/hbgs.hbx similarity index 100% rename from harbour/contrib/hbgs/hbgs.hbx rename to contrib/hbgs/hbgs.hbx diff --git a/harbour/contrib/hbgs/tests/hbmk.hbm b/contrib/hbgs/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbgs/tests/hbmk.hbm rename to contrib/hbgs/tests/hbmk.hbm diff --git a/harbour/contrib/hbgs/tests/test.prg b/contrib/hbgs/tests/test.prg similarity index 100% rename from harbour/contrib/hbgs/tests/test.prg rename to contrib/hbgs/tests/test.prg diff --git a/harbour/contrib/hbgt/asciisgt.c b/contrib/hbgt/asciisgt.c similarity index 100% rename from harbour/contrib/hbgt/asciisgt.c rename to contrib/hbgt/asciisgt.c diff --git a/harbour/contrib/hbgt/ascposgt.c b/contrib/hbgt/ascposgt.c similarity index 100% rename from harbour/contrib/hbgt/ascposgt.c rename to contrib/hbgt/ascposgt.c diff --git a/harbour/contrib/hbgt/atdiff.c b/contrib/hbgt/atdiff.c similarity index 100% rename from harbour/contrib/hbgt/atdiff.c rename to contrib/hbgt/atdiff.c diff --git a/harbour/contrib/hbgt/bitflags.c b/contrib/hbgt/bitflags.c similarity index 100% rename from harbour/contrib/hbgt/bitflags.c rename to contrib/hbgt/bitflags.c diff --git a/harbour/contrib/hbgt/chareven.c b/contrib/hbgt/chareven.c similarity index 100% rename from harbour/contrib/hbgt/chareven.c rename to contrib/hbgt/chareven.c diff --git a/harbour/contrib/hbgt/charmixg.c b/contrib/hbgt/charmixg.c similarity index 100% rename from harbour/contrib/hbgt/charmixg.c rename to contrib/hbgt/charmixg.c diff --git a/harbour/contrib/hbgt/charodd.c b/contrib/hbgt/charodd.c similarity index 100% rename from harbour/contrib/hbgt/charodd.c rename to contrib/hbgt/charodd.c diff --git a/harbour/contrib/hbgt/chrcount.c b/contrib/hbgt/chrcount.c similarity index 100% rename from harbour/contrib/hbgt/chrcount.c rename to contrib/hbgt/chrcount.c diff --git a/harbour/contrib/hbgt/chrfirst.c b/contrib/hbgt/chrfirst.c similarity index 100% rename from harbour/contrib/hbgt/chrfirst.c rename to contrib/hbgt/chrfirst.c diff --git a/harbour/contrib/hbgt/chrtotal.c b/contrib/hbgt/chrtotal.c similarity index 100% rename from harbour/contrib/hbgt/chrtotal.c rename to contrib/hbgt/chrtotal.c diff --git a/harbour/contrib/hbgt/doc/en/hbgt.txt b/contrib/hbgt/doc/en/hbgt.txt similarity index 100% rename from harbour/contrib/hbgt/doc/en/hbgt.txt rename to contrib/hbgt/doc/en/hbgt.txt diff --git a/harbour/contrib/hbgt/hbgt.hbc b/contrib/hbgt/hbgt.hbc similarity index 100% rename from harbour/contrib/hbgt/hbgt.hbc rename to contrib/hbgt/hbgt.hbc diff --git a/harbour/contrib/hbgt/hbgt.hbp b/contrib/hbgt/hbgt.hbp similarity index 100% rename from harbour/contrib/hbgt/hbgt.hbp rename to contrib/hbgt/hbgt.hbp diff --git a/harbour/contrib/hbgt/hbgt.hbx b/contrib/hbgt/hbgt.hbx similarity index 100% rename from harbour/contrib/hbgt/hbgt.hbx rename to contrib/hbgt/hbgt.hbx diff --git a/harbour/contrib/hbgt/strasint.c b/contrib/hbgt/strasint.c similarity index 100% rename from harbour/contrib/hbgt/strasint.c rename to contrib/hbgt/strasint.c diff --git a/harbour/contrib/hbgt/strcount.c b/contrib/hbgt/strcount.c similarity index 100% rename from harbour/contrib/hbgt/strcount.c rename to contrib/hbgt/strcount.c diff --git a/harbour/contrib/hbgt/strcspn.c b/contrib/hbgt/strcspn.c similarity index 100% rename from harbour/contrib/hbgt/strcspn.c rename to contrib/hbgt/strcspn.c diff --git a/harbour/contrib/hbgt/strdiffg.c b/contrib/hbgt/strdiffg.c similarity index 100% rename from harbour/contrib/hbgt/strdiffg.c rename to contrib/hbgt/strdiffg.c diff --git a/harbour/contrib/hbgt/strexpan.c b/contrib/hbgt/strexpan.c similarity index 100% rename from harbour/contrib/hbgt/strexpan.c rename to contrib/hbgt/strexpan.c diff --git a/harbour/contrib/hbgt/strleft.c b/contrib/hbgt/strleft.c similarity index 100% rename from harbour/contrib/hbgt/strleft.c rename to contrib/hbgt/strleft.c diff --git a/harbour/contrib/hbgt/strpbrk.c b/contrib/hbgt/strpbrk.c similarity index 100% rename from harbour/contrib/hbgt/strpbrk.c rename to contrib/hbgt/strpbrk.c diff --git a/harbour/contrib/hbgt/strright.c b/contrib/hbgt/strright.c similarity index 100% rename from harbour/contrib/hbgt/strright.c rename to contrib/hbgt/strright.c diff --git a/harbour/contrib/hbgt/tests/hbmk.hbm b/contrib/hbgt/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbgt/tests/hbmk.hbm rename to contrib/hbgt/tests/hbmk.hbm diff --git a/harbour/contrib/hbgt/tests/test.prg b/contrib/hbgt/tests/test.prg similarity index 100% rename from harbour/contrib/hbgt/tests/test.prg rename to contrib/hbgt/tests/test.prg diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/README b/contrib/hbhpdf/3rd/libhpdf/README similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/README rename to contrib/hbhpdf/3rd/libhpdf/README diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c b/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c rename to contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h b/contrib/hbhpdf/3rd/libhpdf/hpdf.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h rename to contrib/hbhpdf/3rd/libhpdf/hpdf.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf3dme.c b/contrib/hbhpdf/3rd/libhpdf/hpdf3dme.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdf3dme.c rename to contrib/hbhpdf/3rd/libhpdf/hpdf3dme.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf3dme.h b/contrib/hbhpdf/3rd/libhpdf/hpdf3dme.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdf3dme.h rename to contrib/hbhpdf/3rd/libhpdf/hpdf3dme.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfanno.c b/contrib/hbhpdf/3rd/libhpdf/hpdfanno.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfanno.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfanno.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfanno.h b/contrib/hbhpdf/3rd/libhpdf/hpdfanno.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfanno.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfanno.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfarra.c b/contrib/hbhpdf/3rd/libhpdf/hpdfarra.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfarra.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfarra.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfbina.c b/contrib/hbhpdf/3rd/libhpdf/hpdfbina.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfbina.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfbina.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfbool.c b/contrib/hbhpdf/3rd/libhpdf/hpdfbool.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfbool.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfbool.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c b/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfcata.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.h b/contrib/hbhpdf/3rd/libhpdf/hpdfcata.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfcata.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcfg.h b/contrib/hbhpdf/3rd/libhpdf/hpdfcfg.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcfg.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfcfg.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfconf.h b/contrib/hbhpdf/3rd/libhpdf/hpdfconf.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfconf.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfconf.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h b/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfcons.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdest.c b/contrib/hbhpdf/3rd/libhpdf/hpdfdest.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdest.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfdest.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdest.h b/contrib/hbhpdf/3rd/libhpdf/hpdfdest.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdest.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfdest.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdict.c b/contrib/hbhpdf/3rd/libhpdf/hpdfdict.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdict.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfdict.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c b/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.h b/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfdoc.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdocp.c b/contrib/hbhpdf/3rd/libhpdf/hpdfdocp.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdocp.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfdocp.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfecy.c b/contrib/hbhpdf/3rd/libhpdf/hpdfecy.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfecy.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfecy.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfecyd.c b/contrib/hbhpdf/3rd/libhpdf/hpdfecyd.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfecyd.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfecyd.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencc.c b/contrib/hbhpdf/3rd/libhpdf/hpdfencc.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencc.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfencc.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencj.c b/contrib/hbhpdf/3rd/libhpdf/hpdfencj.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencj.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfencj.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenck.c b/contrib/hbhpdf/3rd/libhpdf/hpdfenck.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenck.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfenck.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencn.c b/contrib/hbhpdf/3rd/libhpdf/hpdfencn.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencn.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfencn.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenco.c b/contrib/hbhpdf/3rd/libhpdf/hpdfenco.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenco.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfenco.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenco.h b/contrib/hbhpdf/3rd/libhpdf/hpdfenco.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenco.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfenco.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencr.h b/contrib/hbhpdf/3rd/libhpdf/hpdfencr.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencr.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfencr.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencu.c b/contrib/hbhpdf/3rd/libhpdf/hpdfencu.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencu.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfencu.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfency.h b/contrib/hbhpdf/3rd/libhpdf/hpdfency.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfency.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfency.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdferro.c b/contrib/hbhpdf/3rd/libhpdf/hpdferro.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdferro.c rename to contrib/hbhpdf/3rd/libhpdf/hpdferro.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdferro.h b/contrib/hbhpdf/3rd/libhpdf/hpdferro.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdferro.h rename to contrib/hbhpdf/3rd/libhpdf/hpdferro.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfexda.c b/contrib/hbhpdf/3rd/libhpdf/hpdfexda.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfexda.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfexda.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfexda.h b/contrib/hbhpdf/3rd/libhpdf/hpdfexda.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfexda.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfexda.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfextg.c b/contrib/hbhpdf/3rd/libhpdf/hpdfextg.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfextg.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfextg.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfextg.h b/contrib/hbhpdf/3rd/libhpdf/hpdfextg.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfextg.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfextg.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdf.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdf.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdf.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdf.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdf1.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdf1.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdf1.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdf1.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfb.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdfb.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfb.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdfb.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfc.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdfc.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfc.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdfc.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfi.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdfi.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfi.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdfi.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfj.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdfj.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfj.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdfj.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfk.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdfk.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfk.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdfk.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfn.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdfn.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfn.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdfn.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdft.c b/contrib/hbhpdf/3rd/libhpdf/hpdffdft.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdft.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffdft.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffon1.c b/contrib/hbhpdf/3rd/libhpdf/hpdffon1.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffon1.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffon1.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffonc.c b/contrib/hbhpdf/3rd/libhpdf/hpdffonc.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffonc.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffonc.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffond.h b/contrib/hbhpdf/3rd/libhpdf/hpdffond.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffond.h rename to contrib/hbhpdf/3rd/libhpdf/hpdffond.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffont.c b/contrib/hbhpdf/3rd/libhpdf/hpdffont.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffont.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffont.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffont.h b/contrib/hbhpdf/3rd/libhpdf/hpdffont.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffont.h rename to contrib/hbhpdf/3rd/libhpdf/hpdffont.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffott.c b/contrib/hbhpdf/3rd/libhpdf/hpdffott.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdffott.c rename to contrib/hbhpdf/3rd/libhpdf/hpdffott.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.c b/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfgsta.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.h b/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfgsta.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimac.c b/contrib/hbhpdf/3rd/libhpdf/hpdfimac.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimac.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfimac.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimag.c b/contrib/hbhpdf/3rd/libhpdf/hpdfimag.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimag.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfimag.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimag.h b/contrib/hbhpdf/3rd/libhpdf/hpdfimag.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimag.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfimag.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimap.c b/contrib/hbhpdf/3rd/libhpdf/hpdfimap.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimap.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfimap.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.c b/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfinfo.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.h b/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfinfo.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdflist.c b/contrib/hbhpdf/3rd/libhpdf/hpdflist.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdflist.c rename to contrib/hbhpdf/3rd/libhpdf/hpdflist.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdflist.h b/contrib/hbhpdf/3rd/libhpdf/hpdflist.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdflist.h rename to contrib/hbhpdf/3rd/libhpdf/hpdflist.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.c b/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.h b/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfname.c b/contrib/hbhpdf/3rd/libhpdf/hpdfname.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfname.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfname.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfndic.c b/contrib/hbhpdf/3rd/libhpdf/hpdfndic.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfndic.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfndic.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfndic.h b/contrib/hbhpdf/3rd/libhpdf/hpdfndic.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfndic.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfndic.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfnull.c b/contrib/hbhpdf/3rd/libhpdf/hpdfnull.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfnull.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfnull.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfnumb.c b/contrib/hbhpdf/3rd/libhpdf/hpdfnumb.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfnumb.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfnumb.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfobje.c b/contrib/hbhpdf/3rd/libhpdf/hpdfobje.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfobje.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfobje.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfobje.h b/contrib/hbhpdf/3rd/libhpdf/hpdfobje.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfobje.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfobje.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.c b/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfoutl.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.h b/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfoutl.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpage.c b/contrib/hbhpdf/3rd/libhpdf/hpdfpage.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpage.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfpage.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpage.h b/contrib/hbhpdf/3rd/libhpdf/hpdfpage.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpage.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfpage.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c b/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfpago.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpags.c b/contrib/hbhpdf/3rd/libhpdf/hpdfpags.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpags.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfpags.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpags.h b/contrib/hbhpdf/3rd/libhpdf/hpdfpags.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpags.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfpags.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.c b/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.h b/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfreal.c b/contrib/hbhpdf/3rd/libhpdf/hpdfreal.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfreal.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfreal.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstre.c b/contrib/hbhpdf/3rd/libhpdf/hpdfstre.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstre.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfstre.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstre.h b/contrib/hbhpdf/3rd/libhpdf/hpdfstre.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstre.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfstre.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstri.c b/contrib/hbhpdf/3rd/libhpdf/hpdfstri.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstri.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfstri.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdftype.h b/contrib/hbhpdf/3rd/libhpdf/hpdftype.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdftype.h rename to contrib/hbhpdf/3rd/libhpdf/hpdftype.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.c b/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfu3d.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.h b/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfu3d.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfutil.c b/contrib/hbhpdf/3rd/libhpdf/hpdfutil.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfutil.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfutil.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfutil.h b/contrib/hbhpdf/3rd/libhpdf/hpdfutil.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfutil.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfutil.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h b/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h rename to contrib/hbhpdf/3rd/libhpdf/hpdfvers.h diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfxref.c b/contrib/hbhpdf/3rd/libhpdf/hpdfxref.c similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/hpdfxref.c rename to contrib/hbhpdf/3rd/libhpdf/hpdfxref.c diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif b/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif rename to contrib/hbhpdf/3rd/libhpdf/libhpdf.dif diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc b/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc rename to contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp b/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp rename to contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/t4.h b/contrib/hbhpdf/3rd/libhpdf/t4.h similarity index 100% rename from harbour/contrib/hbhpdf/3rd/libhpdf/t4.h rename to contrib/hbhpdf/3rd/libhpdf/t4.h diff --git a/harbour/contrib/hbhpdf/annot.c b/contrib/hbhpdf/annot.c similarity index 100% rename from harbour/contrib/hbhpdf/annot.c rename to contrib/hbhpdf/annot.c diff --git a/harbour/contrib/hbhpdf/core.c b/contrib/hbhpdf/core.c similarity index 100% rename from harbour/contrib/hbhpdf/core.c rename to contrib/hbhpdf/core.c diff --git a/harbour/contrib/hbhpdf/enccns.c b/contrib/hbhpdf/enccns.c similarity index 100% rename from harbour/contrib/hbhpdf/enccns.c rename to contrib/hbhpdf/enccns.c diff --git a/harbour/contrib/hbhpdf/enccnt.c b/contrib/hbhpdf/enccnt.c similarity index 100% rename from harbour/contrib/hbhpdf/enccnt.c rename to contrib/hbhpdf/enccnt.c diff --git a/harbour/contrib/hbhpdf/encjp.c b/contrib/hbhpdf/encjp.c similarity index 100% rename from harbour/contrib/hbhpdf/encjp.c rename to contrib/hbhpdf/encjp.c diff --git a/harbour/contrib/hbhpdf/enckr.c b/contrib/hbhpdf/enckr.c similarity index 100% rename from harbour/contrib/hbhpdf/enckr.c rename to contrib/hbhpdf/enckr.c diff --git a/harbour/contrib/hbhpdf/errstr.prg b/contrib/hbhpdf/errstr.prg similarity index 100% rename from harbour/contrib/hbhpdf/errstr.prg rename to contrib/hbhpdf/errstr.prg diff --git a/harbour/contrib/hbhpdf/font.c b/contrib/hbhpdf/font.c similarity index 100% rename from harbour/contrib/hbhpdf/font.c rename to contrib/hbhpdf/font.c diff --git a/harbour/contrib/hbhpdf/fontcns.c b/contrib/hbhpdf/fontcns.c similarity index 100% rename from harbour/contrib/hbhpdf/fontcns.c rename to contrib/hbhpdf/fontcns.c diff --git a/harbour/contrib/hbhpdf/fontcnt.c b/contrib/hbhpdf/fontcnt.c similarity index 100% rename from harbour/contrib/hbhpdf/fontcnt.c rename to contrib/hbhpdf/fontcnt.c diff --git a/harbour/contrib/hbhpdf/fontjp.c b/contrib/hbhpdf/fontjp.c similarity index 100% rename from harbour/contrib/hbhpdf/fontjp.c rename to contrib/hbhpdf/fontjp.c diff --git a/harbour/contrib/hbhpdf/fontkr.c b/contrib/hbhpdf/fontkr.c similarity index 100% rename from harbour/contrib/hbhpdf/fontkr.c rename to contrib/hbhpdf/fontkr.c diff --git a/harbour/contrib/hbhpdf/harupdf.ch b/contrib/hbhpdf/harupdf.ch similarity index 100% rename from harbour/contrib/hbhpdf/harupdf.ch rename to contrib/hbhpdf/harupdf.ch diff --git a/harbour/contrib/hbhpdf/hbhpdf.h b/contrib/hbhpdf/hbhpdf.h similarity index 100% rename from harbour/contrib/hbhpdf/hbhpdf.h rename to contrib/hbhpdf/hbhpdf.h diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbc b/contrib/hbhpdf/hbhpdf.hbc similarity index 100% rename from harbour/contrib/hbhpdf/hbhpdf.hbc rename to contrib/hbhpdf/hbhpdf.hbc diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbp b/contrib/hbhpdf/hbhpdf.hbp similarity index 100% rename from harbour/contrib/hbhpdf/hbhpdf.hbp rename to contrib/hbhpdf/hbhpdf.hbp diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbx b/contrib/hbhpdf/hbhpdf.hbx similarity index 100% rename from harbour/contrib/hbhpdf/hbhpdf.hbx rename to contrib/hbhpdf/hbhpdf.hbx diff --git a/harbour/contrib/hbhpdf/image.c b/contrib/hbhpdf/image.c similarity index 100% rename from harbour/contrib/hbhpdf/image.c rename to contrib/hbhpdf/image.c diff --git a/harbour/contrib/hbhpdf/misc.prg b/contrib/hbhpdf/misc.prg similarity index 100% rename from harbour/contrib/hbhpdf/misc.prg rename to contrib/hbhpdf/misc.prg diff --git a/harbour/contrib/hbhpdf/pdfa.c b/contrib/hbhpdf/pdfa.c similarity index 100% rename from harbour/contrib/hbhpdf/pdfa.c rename to contrib/hbhpdf/pdfa.c diff --git a/harbour/contrib/hbhpdf/tests/files/a010013l.afm b/contrib/hbhpdf/tests/files/a010013l.afm similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/a010013l.afm rename to contrib/hbhpdf/tests/files/a010013l.afm diff --git a/harbour/contrib/hbhpdf/tests/files/a010013l.pfb b/contrib/hbhpdf/tests/files/a010013l.pfb similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/a010013l.pfb rename to contrib/hbhpdf/tests/files/a010013l.pfb diff --git a/harbour/contrib/hbhpdf/tests/files/basn0g01.png b/contrib/hbhpdf/tests/files/basn0g01.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn0g01.png rename to contrib/hbhpdf/tests/files/basn0g01.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn0g02.png b/contrib/hbhpdf/tests/files/basn0g02.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn0g02.png rename to contrib/hbhpdf/tests/files/basn0g02.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn0g04.png b/contrib/hbhpdf/tests/files/basn0g04.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn0g04.png rename to contrib/hbhpdf/tests/files/basn0g04.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn0g08.png b/contrib/hbhpdf/tests/files/basn0g08.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn0g08.png rename to contrib/hbhpdf/tests/files/basn0g08.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn0g16.png b/contrib/hbhpdf/tests/files/basn0g16.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn0g16.png rename to contrib/hbhpdf/tests/files/basn0g16.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn2c08.png b/contrib/hbhpdf/tests/files/basn2c08.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn2c08.png rename to contrib/hbhpdf/tests/files/basn2c08.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn2c16.png b/contrib/hbhpdf/tests/files/basn2c16.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn2c16.png rename to contrib/hbhpdf/tests/files/basn2c16.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn3p01.png b/contrib/hbhpdf/tests/files/basn3p01.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn3p01.png rename to contrib/hbhpdf/tests/files/basn3p01.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn3p02.png b/contrib/hbhpdf/tests/files/basn3p02.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn3p02.png rename to contrib/hbhpdf/tests/files/basn3p02.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn3p04.png b/contrib/hbhpdf/tests/files/basn3p04.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn3p04.png rename to contrib/hbhpdf/tests/files/basn3p04.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn3p08.png b/contrib/hbhpdf/tests/files/basn3p08.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn3p08.png rename to contrib/hbhpdf/tests/files/basn3p08.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn4a08.png b/contrib/hbhpdf/tests/files/basn4a08.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn4a08.png rename to contrib/hbhpdf/tests/files/basn4a08.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn4a16.png b/contrib/hbhpdf/tests/files/basn4a16.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn4a16.png rename to contrib/hbhpdf/tests/files/basn4a16.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn6a08.png b/contrib/hbhpdf/tests/files/basn6a08.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn6a08.png rename to contrib/hbhpdf/tests/files/basn6a08.png diff --git a/harbour/contrib/hbhpdf/tests/files/basn6a16.png b/contrib/hbhpdf/tests/files/basn6a16.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/basn6a16.png rename to contrib/hbhpdf/tests/files/basn6a16.png diff --git a/harbour/contrib/hbhpdf/tests/files/cp932.txt b/contrib/hbhpdf/tests/files/cp932.txt similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/cp932.txt rename to contrib/hbhpdf/tests/files/cp932.txt diff --git a/harbour/contrib/hbhpdf/tests/files/cp936.txt b/contrib/hbhpdf/tests/files/cp936.txt similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/cp936.txt rename to contrib/hbhpdf/tests/files/cp936.txt diff --git a/harbour/contrib/hbhpdf/tests/files/elic_jp.txt b/contrib/hbhpdf/tests/files/elic_jp.txt similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/elic_jp.txt rename to contrib/hbhpdf/tests/files/elic_jp.txt diff --git a/harbour/contrib/hbhpdf/tests/files/euc.txt b/contrib/hbhpdf/tests/files/euc.txt similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/euc.txt rename to contrib/hbhpdf/tests/files/euc.txt diff --git a/harbour/contrib/hbhpdf/tests/files/gray.jpg b/contrib/hbhpdf/tests/files/gray.jpg similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/gray.jpg rename to contrib/hbhpdf/tests/files/gray.jpg diff --git a/harbour/contrib/hbhpdf/tests/files/maskimag.png b/contrib/hbhpdf/tests/files/maskimag.png similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/maskimag.png rename to contrib/hbhpdf/tests/files/maskimag.png diff --git a/harbour/contrib/hbhpdf/tests/files/rgb.jpg b/contrib/hbhpdf/tests/files/rgb.jpg similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/rgb.jpg rename to contrib/hbhpdf/tests/files/rgb.jpg diff --git a/harbour/contrib/hbhpdf/tests/files/sjis.txt b/contrib/hbhpdf/tests/files/sjis.txt similarity index 100% rename from harbour/contrib/hbhpdf/tests/files/sjis.txt rename to contrib/hbhpdf/tests/files/sjis.txt diff --git a/harbour/contrib/hbhpdf/tests/harupdf.prg b/contrib/hbhpdf/tests/harupdf.prg similarity index 100% rename from harbour/contrib/hbhpdf/tests/harupdf.prg rename to contrib/hbhpdf/tests/harupdf.prg diff --git a/harbour/contrib/hbhpdf/tests/hbmk.hbm b/contrib/hbhpdf/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbhpdf/tests/hbmk.hbm rename to contrib/hbhpdf/tests/hbmk.hbm diff --git a/harbour/contrib/hbhpdf/tests/test.prg b/contrib/hbhpdf/tests/test.prg similarity index 100% rename from harbour/contrib/hbhpdf/tests/test.prg rename to contrib/hbhpdf/tests/test.prg diff --git a/harbour/contrib/hbhttpd/core.prg b/contrib/hbhttpd/core.prg similarity index 100% rename from harbour/contrib/hbhttpd/core.prg rename to contrib/hbhttpd/core.prg diff --git a/harbour/contrib/hbhttpd/hbhttpd.hbc b/contrib/hbhttpd/hbhttpd.hbc similarity index 100% rename from harbour/contrib/hbhttpd/hbhttpd.hbc rename to contrib/hbhttpd/hbhttpd.hbc diff --git a/harbour/contrib/hbhttpd/hbhttpd.hbp b/contrib/hbhttpd/hbhttpd.hbp similarity index 100% rename from harbour/contrib/hbhttpd/hbhttpd.hbp rename to contrib/hbhttpd/hbhttpd.hbp diff --git a/harbour/contrib/hbhttpd/hbhttpd.hbx b/contrib/hbhttpd/hbhttpd.hbx similarity index 100% rename from harbour/contrib/hbhttpd/hbhttpd.hbx rename to contrib/hbhttpd/hbhttpd.hbx diff --git a/harbour/contrib/hbhttpd/log.prg b/contrib/hbhttpd/log.prg similarity index 100% rename from harbour/contrib/hbhttpd/log.prg rename to contrib/hbhttpd/log.prg diff --git a/harbour/contrib/hbhttpd/readme.txt b/contrib/hbhttpd/readme.txt similarity index 100% rename from harbour/contrib/hbhttpd/readme.txt rename to contrib/hbhttpd/readme.txt diff --git a/harbour/contrib/hbhttpd/tests/carts.dbf b/contrib/hbhttpd/tests/carts.dbf similarity index 100% rename from harbour/contrib/hbhttpd/tests/carts.dbf rename to contrib/hbhttpd/tests/carts.dbf diff --git a/harbour/contrib/hbhttpd/tests/eshop.prg b/contrib/hbhttpd/tests/eshop.prg similarity index 100% rename from harbour/contrib/hbhttpd/tests/eshop.prg rename to contrib/hbhttpd/tests/eshop.prg diff --git a/harbour/contrib/hbhttpd/tests/files/main.css b/contrib/hbhttpd/tests/files/main.css similarity index 100% rename from harbour/contrib/hbhttpd/tests/files/main.css rename to contrib/hbhttpd/tests/files/main.css diff --git a/harbour/contrib/hbhttpd/tests/hbmk.hbm b/contrib/hbhttpd/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbhttpd/tests/hbmk.hbm rename to contrib/hbhttpd/tests/hbmk.hbm diff --git a/harbour/contrib/hbhttpd/tests/items.dbf b/contrib/hbhttpd/tests/items.dbf similarity index 100% rename from harbour/contrib/hbhttpd/tests/items.dbf rename to contrib/hbhttpd/tests/items.dbf diff --git a/harbour/contrib/hbhttpd/tests/tpl/_main.tpl b/contrib/hbhttpd/tests/tpl/_main.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/_main.tpl rename to contrib/hbhttpd/tests/tpl/_main.tpl diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/account.tpl b/contrib/hbhttpd/tests/tpl/app/account.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/app/account.tpl rename to contrib/hbhttpd/tests/tpl/app/account.tpl diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/account/edit.tpl b/contrib/hbhttpd/tests/tpl/app/account/edit.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/app/account/edit.tpl rename to contrib/hbhttpd/tests/tpl/app/account/edit.tpl diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/cart.tpl b/contrib/hbhttpd/tests/tpl/app/cart.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/app/cart.tpl rename to contrib/hbhttpd/tests/tpl/app/cart.tpl diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/login.tpl b/contrib/hbhttpd/tests/tpl/app/login.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/app/login.tpl rename to contrib/hbhttpd/tests/tpl/app/login.tpl diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/logout.tpl b/contrib/hbhttpd/tests/tpl/app/logout.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/app/logout.tpl rename to contrib/hbhttpd/tests/tpl/app/logout.tpl diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/main.tpl b/contrib/hbhttpd/tests/tpl/app/main.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/app/main.tpl rename to contrib/hbhttpd/tests/tpl/app/main.tpl diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/register.tpl b/contrib/hbhttpd/tests/tpl/app/register.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/app/register.tpl rename to contrib/hbhttpd/tests/tpl/app/register.tpl diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/shopping.tpl b/contrib/hbhttpd/tests/tpl/app/shopping.tpl similarity index 100% rename from harbour/contrib/hbhttpd/tests/tpl/app/shopping.tpl rename to contrib/hbhttpd/tests/tpl/app/shopping.tpl diff --git a/harbour/contrib/hbhttpd/tests/users.dbf b/contrib/hbhttpd/tests/users.dbf similarity index 100% rename from harbour/contrib/hbhttpd/tests/users.dbf rename to contrib/hbhttpd/tests/users.dbf diff --git a/harbour/contrib/hbhttpd/widgets.prg b/contrib/hbhttpd/widgets.prg similarity index 100% rename from harbour/contrib/hbhttpd/widgets.prg rename to contrib/hbhttpd/widgets.prg diff --git a/harbour/contrib/hblzf/3rd/liblzf/Changes b/contrib/hblzf/3rd/liblzf/Changes similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/Changes rename to contrib/hblzf/3rd/liblzf/Changes diff --git a/harbour/contrib/hblzf/3rd/liblzf/LICENSE b/contrib/hblzf/3rd/liblzf/LICENSE similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/LICENSE rename to contrib/hblzf/3rd/liblzf/LICENSE diff --git a/harbour/contrib/hblzf/3rd/liblzf/README b/contrib/hblzf/3rd/liblzf/README similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/README rename to contrib/hblzf/3rd/liblzf/README diff --git a/harbour/contrib/hblzf/3rd/liblzf/crc32.h b/contrib/hblzf/3rd/liblzf/crc32.h similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/crc32.h rename to contrib/hblzf/3rd/liblzf/crc32.h diff --git a/harbour/contrib/hblzf/3rd/liblzf/liblzf.dif b/contrib/hblzf/3rd/liblzf/liblzf.dif similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/liblzf.dif rename to contrib/hblzf/3rd/liblzf/liblzf.dif diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzf.h b/contrib/hblzf/3rd/liblzf/lzf.h similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/lzf.h rename to contrib/hblzf/3rd/liblzf/lzf.h diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbc b/contrib/hblzf/3rd/liblzf/lzf.hbc similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/lzf.hbc rename to contrib/hblzf/3rd/liblzf/lzf.hbc diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp b/contrib/hblzf/3rd/liblzf/lzf.hbp similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/lzf.hbp rename to contrib/hblzf/3rd/liblzf/lzf.hbp diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzfP.h b/contrib/hblzf/3rd/liblzf/lzfP.h similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/lzfP.h rename to contrib/hblzf/3rd/liblzf/lzfP.h diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzf_c.c b/contrib/hblzf/3rd/liblzf/lzf_c.c similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/lzf_c.c rename to contrib/hblzf/3rd/liblzf/lzf_c.c diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzf_d.c b/contrib/hblzf/3rd/liblzf/lzf_d.c similarity index 100% rename from harbour/contrib/hblzf/3rd/liblzf/lzf_d.c rename to contrib/hblzf/3rd/liblzf/lzf_d.c diff --git a/harbour/contrib/hblzf/core.c b/contrib/hblzf/core.c similarity index 100% rename from harbour/contrib/hblzf/core.c rename to contrib/hblzf/core.c diff --git a/harbour/contrib/hblzf/hblzf.ch b/contrib/hblzf/hblzf.ch similarity index 100% rename from harbour/contrib/hblzf/hblzf.ch rename to contrib/hblzf/hblzf.ch diff --git a/harbour/contrib/hblzf/hblzf.hbc b/contrib/hblzf/hblzf.hbc similarity index 100% rename from harbour/contrib/hblzf/hblzf.hbc rename to contrib/hblzf/hblzf.hbc diff --git a/harbour/contrib/hblzf/hblzf.hbp b/contrib/hblzf/hblzf.hbp similarity index 100% rename from harbour/contrib/hblzf/hblzf.hbp rename to contrib/hblzf/hblzf.hbp diff --git a/harbour/contrib/hblzf/hblzf.hbx b/contrib/hblzf/hblzf.hbx similarity index 100% rename from harbour/contrib/hblzf/hblzf.hbx rename to contrib/hblzf/hblzf.hbx diff --git a/harbour/contrib/hblzf/tests/hbmk.hbm b/contrib/hblzf/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hblzf/tests/hbmk.hbm rename to contrib/hblzf/tests/hbmk.hbm diff --git a/harbour/contrib/hblzf/tests/test.prg b/contrib/hblzf/tests/test.prg similarity index 100% rename from harbour/contrib/hblzf/tests/test.prg rename to contrib/hblzf/tests/test.prg diff --git a/harbour/contrib/hblzf/tests/test2.prg b/contrib/hblzf/tests/test2.prg similarity index 100% rename from harbour/contrib/hblzf/tests/test2.prg rename to contrib/hblzf/tests/test2.prg diff --git a/harbour/contrib/hbmagic/core.c b/contrib/hbmagic/core.c similarity index 100% rename from harbour/contrib/hbmagic/core.c rename to contrib/hbmagic/core.c diff --git a/harbour/contrib/hbmagic/hbmagic.ch b/contrib/hbmagic/hbmagic.ch similarity index 100% rename from harbour/contrib/hbmagic/hbmagic.ch rename to contrib/hbmagic/hbmagic.ch diff --git a/harbour/contrib/hbmagic/hbmagic.hbc b/contrib/hbmagic/hbmagic.hbc similarity index 100% rename from harbour/contrib/hbmagic/hbmagic.hbc rename to contrib/hbmagic/hbmagic.hbc diff --git a/harbour/contrib/hbmagic/hbmagic.hbp b/contrib/hbmagic/hbmagic.hbp similarity index 100% rename from harbour/contrib/hbmagic/hbmagic.hbp rename to contrib/hbmagic/hbmagic.hbp diff --git a/harbour/contrib/hbmagic/hbmagic.hbx b/contrib/hbmagic/hbmagic.hbx similarity index 100% rename from harbour/contrib/hbmagic/hbmagic.hbx rename to contrib/hbmagic/hbmagic.hbx diff --git a/harbour/contrib/hbmagic/hbmagis.prg b/contrib/hbmagic/hbmagis.prg similarity index 100% rename from harbour/contrib/hbmagic/hbmagis.prg rename to contrib/hbmagic/hbmagis.prg diff --git a/harbour/contrib/hbmagic/tests/hbmagit.prg b/contrib/hbmagic/tests/hbmagit.prg similarity index 100% rename from harbour/contrib/hbmagic/tests/hbmagit.prg rename to contrib/hbmagic/tests/hbmagit.prg diff --git a/harbour/contrib/hbmagic/tests/hbmk.hbm b/contrib/hbmagic/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbmagic/tests/hbmk.hbm rename to contrib/hbmagic/tests/hbmk.hbm diff --git a/harbour/contrib/hbmemio/hbmemio.hbc b/contrib/hbmemio/hbmemio.hbc similarity index 100% rename from harbour/contrib/hbmemio/hbmemio.hbc rename to contrib/hbmemio/hbmemio.hbc diff --git a/harbour/contrib/hbmemio/hbmemio.hbp b/contrib/hbmemio/hbmemio.hbp similarity index 100% rename from harbour/contrib/hbmemio/hbmemio.hbp rename to contrib/hbmemio/hbmemio.hbp diff --git a/harbour/contrib/hbmemio/hbmemio.hbx b/contrib/hbmemio/hbmemio.hbx similarity index 100% rename from harbour/contrib/hbmemio/hbmemio.hbx rename to contrib/hbmemio/hbmemio.hbx diff --git a/harbour/contrib/hbmemio/memio.c b/contrib/hbmemio/memio.c similarity index 100% rename from harbour/contrib/hbmemio/memio.c rename to contrib/hbmemio/memio.c diff --git a/harbour/contrib/hbmemio/tests/hbmk.hbm b/contrib/hbmemio/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbmemio/tests/hbmk.hbm rename to contrib/hbmemio/tests/hbmk.hbm diff --git a/harbour/contrib/hbmemio/tests/test.prg b/contrib/hbmemio/tests/test.prg similarity index 100% rename from harbour/contrib/hbmemio/tests/test.prg rename to contrib/hbmemio/tests/test.prg diff --git a/harbour/contrib/hbmisc/bbabble.c b/contrib/hbmisc/bbabble.c similarity index 100% rename from harbour/contrib/hbmisc/bbabble.c rename to contrib/hbmisc/bbabble.c diff --git a/harbour/contrib/hbmisc/calldll.prg b/contrib/hbmisc/calldll.prg similarity index 100% rename from harbour/contrib/hbmisc/calldll.prg rename to contrib/hbmisc/calldll.prg diff --git a/harbour/contrib/hbmisc/dates.c b/contrib/hbmisc/dates.c similarity index 100% rename from harbour/contrib/hbmisc/dates.c rename to contrib/hbmisc/dates.c diff --git a/harbour/contrib/hbmisc/doc/en/dates2.txt b/contrib/hbmisc/doc/en/dates2.txt similarity index 100% rename from harbour/contrib/hbmisc/doc/en/dates2.txt rename to contrib/hbmisc/doc/en/dates2.txt diff --git a/harbour/contrib/hbmisc/doc/en/ht_class.txt b/contrib/hbmisc/doc/en/ht_class.txt similarity index 100% rename from harbour/contrib/hbmisc/doc/en/ht_class.txt rename to contrib/hbmisc/doc/en/ht_class.txt diff --git a/harbour/contrib/hbmisc/doc/en/ht_conv.txt b/contrib/hbmisc/doc/en/ht_conv.txt similarity index 100% rename from harbour/contrib/hbmisc/doc/en/ht_conv.txt rename to contrib/hbmisc/doc/en/ht_conv.txt diff --git a/harbour/contrib/hbmisc/doc/en/ht_doc.txt b/contrib/hbmisc/doc/en/ht_doc.txt similarity index 100% rename from harbour/contrib/hbmisc/doc/en/ht_doc.txt rename to contrib/hbmisc/doc/en/ht_doc.txt diff --git a/harbour/contrib/hbmisc/doc/en/ht_file.txt b/contrib/hbmisc/doc/en/ht_file.txt similarity index 100% rename from harbour/contrib/hbmisc/doc/en/ht_file.txt rename to contrib/hbmisc/doc/en/ht_file.txt diff --git a/harbour/contrib/hbmisc/doc/en/ht_str.txt b/contrib/hbmisc/doc/en/ht_str.txt similarity index 100% rename from harbour/contrib/hbmisc/doc/en/ht_str.txt rename to contrib/hbmisc/doc/en/ht_str.txt diff --git a/harbour/contrib/hbmisc/fcomma.prg b/contrib/hbmisc/fcomma.prg similarity index 100% rename from harbour/contrib/hbmisc/fcomma.prg rename to contrib/hbmisc/fcomma.prg diff --git a/harbour/contrib/hbmisc/ffind.c b/contrib/hbmisc/ffind.c similarity index 100% rename from harbour/contrib/hbmisc/ffind.c rename to contrib/hbmisc/ffind.c diff --git a/harbour/contrib/hbmisc/fileread.prg b/contrib/hbmisc/fileread.prg similarity index 100% rename from harbour/contrib/hbmisc/fileread.prg rename to contrib/hbmisc/fileread.prg diff --git a/harbour/contrib/hbmisc/hb_f.c b/contrib/hbmisc/hb_f.c similarity index 100% rename from harbour/contrib/hbmisc/hb_f.c rename to contrib/hbmisc/hb_f.c diff --git a/harbour/contrib/hbmisc/hbedit.prg b/contrib/hbmisc/hbedit.prg similarity index 100% rename from harbour/contrib/hbmisc/hbedit.prg rename to contrib/hbmisc/hbedit.prg diff --git a/harbour/contrib/hbmisc/hbeditc.c b/contrib/hbmisc/hbeditc.c similarity index 100% rename from harbour/contrib/hbmisc/hbeditc.c rename to contrib/hbmisc/hbeditc.c diff --git a/harbour/contrib/hbmisc/hbmisc.hbc b/contrib/hbmisc/hbmisc.hbc similarity index 100% rename from harbour/contrib/hbmisc/hbmisc.hbc rename to contrib/hbmisc/hbmisc.hbc diff --git a/harbour/contrib/hbmisc/hbmisc.hbp b/contrib/hbmisc/hbmisc.hbp similarity index 100% rename from harbour/contrib/hbmisc/hbmisc.hbp rename to contrib/hbmisc/hbmisc.hbp diff --git a/harbour/contrib/hbmisc/hbmisc.hbx b/contrib/hbmisc/hbmisc.hbx similarity index 100% rename from harbour/contrib/hbmisc/hbmisc.hbx rename to contrib/hbmisc/hbmisc.hbx diff --git a/harbour/contrib/hbmisc/irm.c b/contrib/hbmisc/irm.c similarity index 100% rename from harbour/contrib/hbmisc/irm.c rename to contrib/hbmisc/irm.c diff --git a/harbour/contrib/hbmisc/nconvert.prg b/contrib/hbmisc/nconvert.prg similarity index 100% rename from harbour/contrib/hbmisc/nconvert.prg rename to contrib/hbmisc/nconvert.prg diff --git a/harbour/contrib/hbmisc/numtxten.prg b/contrib/hbmisc/numtxten.prg similarity index 100% rename from harbour/contrib/hbmisc/numtxten.prg rename to contrib/hbmisc/numtxten.prg diff --git a/harbour/contrib/hbmisc/numtxthu.prg b/contrib/hbmisc/numtxthu.prg similarity index 100% rename from harbour/contrib/hbmisc/numtxthu.prg rename to contrib/hbmisc/numtxthu.prg diff --git a/harbour/contrib/hbmisc/numtxtru.prg b/contrib/hbmisc/numtxtru.prg similarity index 100% rename from harbour/contrib/hbmisc/numtxtru.prg rename to contrib/hbmisc/numtxtru.prg diff --git a/harbour/contrib/hbmisc/spd.c b/contrib/hbmisc/spd.c similarity index 100% rename from harbour/contrib/hbmisc/spd.c rename to contrib/hbmisc/spd.c diff --git a/harbour/contrib/hbmisc/strfmt.c b/contrib/hbmisc/strfmt.c similarity index 100% rename from harbour/contrib/hbmisc/strfmt.c rename to contrib/hbmisc/strfmt.c diff --git a/harbour/contrib/hbmisc/stringp.prg b/contrib/hbmisc/stringp.prg similarity index 100% rename from harbour/contrib/hbmisc/stringp.prg rename to contrib/hbmisc/stringp.prg diff --git a/harbour/contrib/hbmisc/stringsx.c b/contrib/hbmisc/stringsx.c similarity index 100% rename from harbour/contrib/hbmisc/stringsx.c rename to contrib/hbmisc/stringsx.c diff --git a/harbour/contrib/hbmisc/tests/bubbleb.prg b/contrib/hbmisc/tests/bubbleb.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/bubbleb.prg rename to contrib/hbmisc/tests/bubbleb.prg diff --git a/harbour/contrib/hbmisc/tests/calldll.prg b/contrib/hbmisc/tests/calldll.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/calldll.prg rename to contrib/hbmisc/tests/calldll.prg diff --git a/harbour/contrib/hbmisc/tests/hb_f.prg b/contrib/hbmisc/tests/hb_f.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/hb_f.prg rename to contrib/hbmisc/tests/hb_f.prg diff --git a/harbour/contrib/hbmisc/tests/hbmk.hbm b/contrib/hbmisc/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbmisc/tests/hbmk.hbm rename to contrib/hbmisc/tests/hbmk.hbm diff --git a/harbour/contrib/hbmisc/tests/numtxtru.prg b/contrib/hbmisc/tests/numtxtru.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/numtxtru.prg rename to contrib/hbmisc/tests/numtxtru.prg diff --git a/harbour/contrib/hbmisc/tests/pe.prg b/contrib/hbmisc/tests/pe.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/pe.prg rename to contrib/hbmisc/tests/pe.prg diff --git a/harbour/contrib/hbmisc/tests/readfile.prg b/contrib/hbmisc/tests/readfile.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/readfile.prg rename to contrib/hbmisc/tests/readfile.prg diff --git a/harbour/contrib/hbmisc/tests/rtfclass.prg b/contrib/hbmisc/tests/rtfclass.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/rtfclass.prg rename to contrib/hbmisc/tests/rtfclass.prg diff --git a/harbour/contrib/hbmisc/tests/sample.txt b/contrib/hbmisc/tests/sample.txt similarity index 100% rename from harbour/contrib/hbmisc/tests/sample.txt rename to contrib/hbmisc/tests/sample.txt diff --git a/harbour/contrib/hbmisc/tests/strfmt.prg b/contrib/hbmisc/tests/strfmt.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/strfmt.prg rename to contrib/hbmisc/tests/strfmt.prg diff --git a/harbour/contrib/hbmisc/tests/twirler.prg b/contrib/hbmisc/tests/twirler.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/twirler.prg rename to contrib/hbmisc/tests/twirler.prg diff --git a/harbour/contrib/hbmisc/tests/udpds.prg b/contrib/hbmisc/tests/udpds.prg similarity index 100% rename from harbour/contrib/hbmisc/tests/udpds.prg rename to contrib/hbmisc/tests/udpds.prg diff --git a/harbour/contrib/hbmisc/twirler.prg b/contrib/hbmisc/twirler.prg similarity index 100% rename from harbour/contrib/hbmisc/twirler.prg rename to contrib/hbmisc/twirler.prg diff --git a/harbour/contrib/hbmisc/udpds.prg b/contrib/hbmisc/udpds.prg similarity index 100% rename from harbour/contrib/hbmisc/udpds.prg rename to contrib/hbmisc/udpds.prg diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/COPYING b/contrib/hbmlzo/3rd/minilzo/COPYING similarity index 100% rename from harbour/contrib/hbmlzo/3rd/minilzo/COPYING rename to contrib/hbmlzo/3rd/minilzo/COPYING diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/README b/contrib/hbmlzo/3rd/minilzo/README similarity index 100% rename from harbour/contrib/hbmlzo/3rd/minilzo/README rename to contrib/hbmlzo/3rd/minilzo/README diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/lzoconf.h b/contrib/hbmlzo/3rd/minilzo/lzoconf.h similarity index 100% rename from harbour/contrib/hbmlzo/3rd/minilzo/lzoconf.h rename to contrib/hbmlzo/3rd/minilzo/lzoconf.h diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/lzodefs.h b/contrib/hbmlzo/3rd/minilzo/lzodefs.h similarity index 100% rename from harbour/contrib/hbmlzo/3rd/minilzo/lzodefs.h rename to contrib/hbmlzo/3rd/minilzo/lzodefs.h diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.c b/contrib/hbmlzo/3rd/minilzo/minilzo.c similarity index 100% rename from harbour/contrib/hbmlzo/3rd/minilzo/minilzo.c rename to contrib/hbmlzo/3rd/minilzo/minilzo.c diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.h b/contrib/hbmlzo/3rd/minilzo/minilzo.h similarity index 100% rename from harbour/contrib/hbmlzo/3rd/minilzo/minilzo.h rename to contrib/hbmlzo/3rd/minilzo/minilzo.h diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbc b/contrib/hbmlzo/3rd/minilzo/minilzo.hbc similarity index 100% rename from harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbc rename to contrib/hbmlzo/3rd/minilzo/minilzo.hbc diff --git a/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp b/contrib/hbmlzo/3rd/minilzo/minilzo.hbp similarity index 100% rename from harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp rename to contrib/hbmlzo/3rd/minilzo/minilzo.hbp diff --git a/harbour/contrib/hbmlzo/core.c b/contrib/hbmlzo/core.c similarity index 100% rename from harbour/contrib/hbmlzo/core.c rename to contrib/hbmlzo/core.c diff --git a/harbour/contrib/hbmlzo/hbmlzo.ch b/contrib/hbmlzo/hbmlzo.ch similarity index 100% rename from harbour/contrib/hbmlzo/hbmlzo.ch rename to contrib/hbmlzo/hbmlzo.ch diff --git a/harbour/contrib/hbmlzo/hbmlzo.hbc b/contrib/hbmlzo/hbmlzo.hbc similarity index 100% rename from harbour/contrib/hbmlzo/hbmlzo.hbc rename to contrib/hbmlzo/hbmlzo.hbc diff --git a/harbour/contrib/hbmlzo/hbmlzo.hbp b/contrib/hbmlzo/hbmlzo.hbp similarity index 100% rename from harbour/contrib/hbmlzo/hbmlzo.hbp rename to contrib/hbmlzo/hbmlzo.hbp diff --git a/harbour/contrib/hbmlzo/hbmlzo.hbx b/contrib/hbmlzo/hbmlzo.hbx similarity index 100% rename from harbour/contrib/hbmlzo/hbmlzo.hbx rename to contrib/hbmlzo/hbmlzo.hbx diff --git a/harbour/contrib/hbmlzo/tests/hbmk.hbm b/contrib/hbmlzo/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbmlzo/tests/hbmk.hbm rename to contrib/hbmlzo/tests/hbmk.hbm diff --git a/harbour/contrib/hbmlzo/tests/test.prg b/contrib/hbmlzo/tests/test.prg similarity index 100% rename from harbour/contrib/hbmlzo/tests/test.prg rename to contrib/hbmlzo/tests/test.prg diff --git a/harbour/contrib/hbmxml/3rd/minixml/COPYING b/contrib/hbmxml/3rd/minixml/COPYING similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/COPYING rename to contrib/hbmxml/3rd/minixml/COPYING diff --git a/harbour/contrib/hbmxml/3rd/minixml/config.h b/contrib/hbmxml/3rd/minixml/config.h similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/config.h rename to contrib/hbmxml/3rd/minixml/config.h diff --git a/harbour/contrib/hbmxml/3rd/minixml/minixml.dif b/contrib/hbmxml/3rd/minixml/minixml.dif similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/minixml.dif rename to contrib/hbmxml/3rd/minixml/minixml.dif diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml.h b/contrib/hbmxml/3rd/minixml/mxml.h similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml.h rename to contrib/hbmxml/3rd/minixml/mxml.h diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbc b/contrib/hbmxml/3rd/minixml/mxml.hbc similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml.hbc rename to contrib/hbmxml/3rd/minixml/mxml.hbc diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp b/contrib/hbmxml/3rd/minixml/mxml.hbp similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml.hbp rename to contrib/hbmxml/3rd/minixml/mxml.hbp diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_att.c b/contrib/hbmxml/3rd/minixml/mxml_att.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_att.c rename to contrib/hbmxml/3rd/minixml/mxml_att.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_ent.c b/contrib/hbmxml/3rd/minixml/mxml_ent.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_ent.c rename to contrib/hbmxml/3rd/minixml/mxml_ent.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_fil.c b/contrib/hbmxml/3rd/minixml/mxml_fil.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_fil.c rename to contrib/hbmxml/3rd/minixml/mxml_fil.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_get.c b/contrib/hbmxml/3rd/minixml/mxml_get.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_get.c rename to contrib/hbmxml/3rd/minixml/mxml_get.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_ind.c b/contrib/hbmxml/3rd/minixml/mxml_ind.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_ind.c rename to contrib/hbmxml/3rd/minixml/mxml_ind.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_nod.c b/contrib/hbmxml/3rd/minixml/mxml_nod.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_nod.c rename to contrib/hbmxml/3rd/minixml/mxml_nod.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_pri.c b/contrib/hbmxml/3rd/minixml/mxml_pri.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_pri.c rename to contrib/hbmxml/3rd/minixml/mxml_pri.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_pri.h b/contrib/hbmxml/3rd/minixml/mxml_pri.h similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_pri.h rename to contrib/hbmxml/3rd/minixml/mxml_pri.h diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_sea.c b/contrib/hbmxml/3rd/minixml/mxml_sea.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_sea.c rename to contrib/hbmxml/3rd/minixml/mxml_sea.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_set.c b/contrib/hbmxml/3rd/minixml/mxml_set.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_set.c rename to contrib/hbmxml/3rd/minixml/mxml_set.c diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml_str.c b/contrib/hbmxml/3rd/minixml/mxml_str.c similarity index 100% rename from harbour/contrib/hbmxml/3rd/minixml/mxml_str.c rename to contrib/hbmxml/3rd/minixml/mxml_str.c diff --git a/harbour/contrib/hbmxml/core.c b/contrib/hbmxml/core.c similarity index 100% rename from harbour/contrib/hbmxml/core.c rename to contrib/hbmxml/core.c diff --git a/harbour/contrib/hbmxml/format.prg b/contrib/hbmxml/format.prg similarity index 100% rename from harbour/contrib/hbmxml/format.prg rename to contrib/hbmxml/format.prg diff --git a/harbour/contrib/hbmxml/hbmxml.ch b/contrib/hbmxml/hbmxml.ch similarity index 100% rename from harbour/contrib/hbmxml/hbmxml.ch rename to contrib/hbmxml/hbmxml.ch diff --git a/harbour/contrib/hbmxml/hbmxml.hbc b/contrib/hbmxml/hbmxml.hbc similarity index 100% rename from harbour/contrib/hbmxml/hbmxml.hbc rename to contrib/hbmxml/hbmxml.hbc diff --git a/harbour/contrib/hbmxml/hbmxml.hbp b/contrib/hbmxml/hbmxml.hbp similarity index 100% rename from harbour/contrib/hbmxml/hbmxml.hbp rename to contrib/hbmxml/hbmxml.hbp diff --git a/harbour/contrib/hbmxml/hbmxml.hbx b/contrib/hbmxml/hbmxml.hbx similarity index 100% rename from harbour/contrib/hbmxml/hbmxml.hbx rename to contrib/hbmxml/hbmxml.hbx diff --git a/harbour/contrib/hbmxml/tests/custom.prg b/contrib/hbmxml/tests/custom.prg similarity index 100% rename from harbour/contrib/hbmxml/tests/custom.prg rename to contrib/hbmxml/tests/custom.prg diff --git a/harbour/contrib/hbmxml/tests/hbmk.hbm b/contrib/hbmxml/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbmxml/tests/hbmk.hbm rename to contrib/hbmxml/tests/hbmk.hbm diff --git a/harbour/contrib/hbmxml/tests/rem.xml b/contrib/hbmxml/tests/rem.xml similarity index 100% rename from harbour/contrib/hbmxml/tests/rem.xml rename to contrib/hbmxml/tests/rem.xml diff --git a/harbour/contrib/hbmxml/tests/rem_err.xml b/contrib/hbmxml/tests/rem_err.xml similarity index 100% rename from harbour/contrib/hbmxml/tests/rem_err.xml rename to contrib/hbmxml/tests/rem_err.xml diff --git a/harbour/contrib/hbmxml/tests/reminder.prg b/contrib/hbmxml/tests/reminder.prg similarity index 100% rename from harbour/contrib/hbmxml/tests/reminder.prg rename to contrib/hbmxml/tests/reminder.prg diff --git a/harbour/contrib/hbmxml/tests/test.xml b/contrib/hbmxml/tests/test.xml similarity index 100% rename from harbour/contrib/hbmxml/tests/test.xml rename to contrib/hbmxml/tests/test.xml diff --git a/harbour/contrib/hbmxml/tests/testmxml.prg b/contrib/hbmxml/tests/testmxml.prg similarity index 100% rename from harbour/contrib/hbmxml/tests/testmxml.prg rename to contrib/hbmxml/tests/testmxml.prg diff --git a/harbour/contrib/hbmysql/diff-en.txt b/contrib/hbmysql/diff-en.txt similarity index 100% rename from harbour/contrib/hbmysql/diff-en.txt rename to contrib/hbmysql/diff-en.txt diff --git a/harbour/contrib/hbmysql/diff-es.txt b/contrib/hbmysql/diff-es.txt similarity index 100% rename from harbour/contrib/hbmysql/diff-es.txt rename to contrib/hbmysql/diff-es.txt diff --git a/harbour/contrib/hbmysql/hbmysql.hbc b/contrib/hbmysql/hbmysql.hbc similarity index 100% rename from harbour/contrib/hbmysql/hbmysql.hbc rename to contrib/hbmysql/hbmysql.hbc diff --git a/harbour/contrib/hbmysql/hbmysql.hbp b/contrib/hbmysql/hbmysql.hbp similarity index 100% rename from harbour/contrib/hbmysql/hbmysql.hbp rename to contrib/hbmysql/hbmysql.hbp diff --git a/harbour/contrib/hbmysql/hbmysql.hbx b/contrib/hbmysql/hbmysql.hbx similarity index 100% rename from harbour/contrib/hbmysql/hbmysql.hbx rename to contrib/hbmysql/hbmysql.hbx diff --git a/harbour/contrib/hbmysql/mysql.c b/contrib/hbmysql/mysql.c similarity index 100% rename from harbour/contrib/hbmysql/mysql.c rename to contrib/hbmysql/mysql.c diff --git a/harbour/contrib/hbmysql/mysql.ch b/contrib/hbmysql/mysql.ch similarity index 100% rename from harbour/contrib/hbmysql/mysql.ch rename to contrib/hbmysql/mysql.ch diff --git a/harbour/contrib/hbmysql/readme.txt b/contrib/hbmysql/readme.txt similarity index 100% rename from harbour/contrib/hbmysql/readme.txt rename to contrib/hbmysql/readme.txt diff --git a/harbour/contrib/hbmysql/tests/dbf2mysq.prg b/contrib/hbmysql/tests/dbf2mysq.prg similarity index 100% rename from harbour/contrib/hbmysql/tests/dbf2mysq.prg rename to contrib/hbmysql/tests/dbf2mysq.prg diff --git a/harbour/contrib/hbmysql/tests/hbmk.hbm b/contrib/hbmysql/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbmysql/tests/hbmk.hbm rename to contrib/hbmysql/tests/hbmk.hbm diff --git a/harbour/contrib/hbmysql/tests/test.prg b/contrib/hbmysql/tests/test.prg similarity index 100% rename from harbour/contrib/hbmysql/tests/test.prg rename to contrib/hbmysql/tests/test.prg diff --git a/harbour/contrib/hbmysql/tmysql.prg b/contrib/hbmysql/tmysql.prg similarity index 100% rename from harbour/contrib/hbmysql/tmysql.prg rename to contrib/hbmysql/tmysql.prg diff --git a/harbour/contrib/hbmysql/tsqlbrw.prg b/contrib/hbmysql/tsqlbrw.prg similarity index 100% rename from harbour/contrib/hbmysql/tsqlbrw.prg rename to contrib/hbmysql/tsqlbrw.prg diff --git a/harbour/contrib/hbmzip/3rd/minizip/crypt.h b/contrib/hbmzip/3rd/minizip/crypt.h similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/crypt.h rename to contrib/hbmzip/3rd/minizip/crypt.h diff --git a/harbour/contrib/hbmzip/3rd/minizip/ioapi.c b/contrib/hbmzip/3rd/minizip/ioapi.c similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/ioapi.c rename to contrib/hbmzip/3rd/minizip/ioapi.c diff --git a/harbour/contrib/hbmzip/3rd/minizip/ioapi.h b/contrib/hbmzip/3rd/minizip/ioapi.h similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/ioapi.h rename to contrib/hbmzip/3rd/minizip/ioapi.h diff --git a/harbour/contrib/hbmzip/3rd/minizip/minizip.dif b/contrib/hbmzip/3rd/minizip/minizip.dif similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/minizip.dif rename to contrib/hbmzip/3rd/minizip/minizip.dif diff --git a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbc b/contrib/hbmzip/3rd/minizip/minizip.hbc similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/minizip.hbc rename to contrib/hbmzip/3rd/minizip/minizip.hbc diff --git a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp b/contrib/hbmzip/3rd/minizip/minizip.hbp similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/minizip.hbp rename to contrib/hbmzip/3rd/minizip/minizip.hbp diff --git a/harbour/contrib/hbmzip/3rd/minizip/unzip.c b/contrib/hbmzip/3rd/minizip/unzip.c similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/unzip.c rename to contrib/hbmzip/3rd/minizip/unzip.c diff --git a/harbour/contrib/hbmzip/3rd/minizip/unzip.h b/contrib/hbmzip/3rd/minizip/unzip.h similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/unzip.h rename to contrib/hbmzip/3rd/minizip/unzip.h diff --git a/harbour/contrib/hbmzip/3rd/minizip/zip.c b/contrib/hbmzip/3rd/minizip/zip.c similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/zip.c rename to contrib/hbmzip/3rd/minizip/zip.c diff --git a/harbour/contrib/hbmzip/3rd/minizip/zip.h b/contrib/hbmzip/3rd/minizip/zip.h similarity index 100% rename from harbour/contrib/hbmzip/3rd/minizip/zip.h rename to contrib/hbmzip/3rd/minizip/zip.h diff --git a/harbour/contrib/hbmzip/hbmzip.ch b/contrib/hbmzip/hbmzip.ch similarity index 100% rename from harbour/contrib/hbmzip/hbmzip.ch rename to contrib/hbmzip/hbmzip.ch diff --git a/harbour/contrib/hbmzip/hbmzip.hbc b/contrib/hbmzip/hbmzip.hbc similarity index 100% rename from harbour/contrib/hbmzip/hbmzip.hbc rename to contrib/hbmzip/hbmzip.hbc diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/contrib/hbmzip/hbmzip.hbp similarity index 100% rename from harbour/contrib/hbmzip/hbmzip.hbp rename to contrib/hbmzip/hbmzip.hbp diff --git a/harbour/contrib/hbmzip/hbmzip.hbx b/contrib/hbmzip/hbmzip.hbx similarity index 100% rename from harbour/contrib/hbmzip/hbmzip.hbx rename to contrib/hbmzip/hbmzip.hbx diff --git a/harbour/contrib/hbmzip/mzip.c b/contrib/hbmzip/mzip.c similarity index 100% rename from harbour/contrib/hbmzip/mzip.c rename to contrib/hbmzip/mzip.c diff --git a/harbour/contrib/hbmzip/mziperr.prg b/contrib/hbmzip/mziperr.prg similarity index 100% rename from harbour/contrib/hbmzip/mziperr.prg rename to contrib/hbmzip/mziperr.prg diff --git a/harbour/contrib/hbmzip/readme.txt b/contrib/hbmzip/readme.txt similarity index 100% rename from harbour/contrib/hbmzip/readme.txt rename to contrib/hbmzip/readme.txt diff --git a/harbour/contrib/hbmzip/tests/hbmk.hbm b/contrib/hbmzip/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbmzip/tests/hbmk.hbm rename to contrib/hbmzip/tests/hbmk.hbm diff --git a/harbour/contrib/hbmzip/tests/myunzip.prg b/contrib/hbmzip/tests/myunzip.prg similarity index 100% rename from harbour/contrib/hbmzip/tests/myunzip.prg rename to contrib/hbmzip/tests/myunzip.prg diff --git a/harbour/contrib/hbmzip/tests/myzip.prg b/contrib/hbmzip/tests/myzip.prg similarity index 100% rename from harbour/contrib/hbmzip/tests/myzip.prg rename to contrib/hbmzip/tests/myzip.prg diff --git a/harbour/contrib/hbnetio/hbnetio.ch b/contrib/hbnetio/hbnetio.ch similarity index 100% rename from harbour/contrib/hbnetio/hbnetio.ch rename to contrib/hbnetio/hbnetio.ch diff --git a/harbour/contrib/hbnetio/hbnetio.hbc b/contrib/hbnetio/hbnetio.hbc similarity index 100% rename from harbour/contrib/hbnetio/hbnetio.hbc rename to contrib/hbnetio/hbnetio.hbc diff --git a/harbour/contrib/hbnetio/hbnetio.hbp b/contrib/hbnetio/hbnetio.hbp similarity index 100% rename from harbour/contrib/hbnetio/hbnetio.hbp rename to contrib/hbnetio/hbnetio.hbp diff --git a/harbour/contrib/hbnetio/hbnetio.hbx b/contrib/hbnetio/hbnetio.hbx similarity index 100% rename from harbour/contrib/hbnetio/hbnetio.hbx rename to contrib/hbnetio/hbnetio.hbx diff --git a/harbour/contrib/hbnetio/netio.h b/contrib/hbnetio/netio.h similarity index 100% rename from harbour/contrib/hbnetio/netio.h rename to contrib/hbnetio/netio.h diff --git a/harbour/contrib/hbnetio/netiocli.c b/contrib/hbnetio/netiocli.c similarity index 100% rename from harbour/contrib/hbnetio/netiocli.c rename to contrib/hbnetio/netiocli.c diff --git a/harbour/contrib/hbnetio/netiomt.prg b/contrib/hbnetio/netiomt.prg similarity index 100% rename from harbour/contrib/hbnetio/netiomt.prg rename to contrib/hbnetio/netiomt.prg diff --git a/harbour/contrib/hbnetio/netiosrv.c b/contrib/hbnetio/netiosrv.c similarity index 100% rename from harbour/contrib/hbnetio/netiosrv.c rename to contrib/hbnetio/netiosrv.c diff --git a/harbour/contrib/hbnetio/readme.txt b/contrib/hbnetio/readme.txt similarity index 100% rename from harbour/contrib/hbnetio/readme.txt rename to contrib/hbnetio/readme.txt diff --git a/harbour/contrib/hbnetio/tests/hbmk.hbm b/contrib/hbnetio/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbnetio/tests/hbmk.hbm rename to contrib/hbnetio/tests/hbmk.hbm diff --git a/harbour/contrib/hbnetio/tests/netiomt1.prg b/contrib/hbnetio/tests/netiomt1.prg similarity index 100% rename from harbour/contrib/hbnetio/tests/netiomt1.prg rename to contrib/hbnetio/tests/netiomt1.prg diff --git a/harbour/contrib/hbnetio/tests/netiot02.prg b/contrib/hbnetio/tests/netiot02.prg similarity index 100% rename from harbour/contrib/hbnetio/tests/netiot02.prg rename to contrib/hbnetio/tests/netiot02.prg diff --git a/harbour/contrib/hbnetio/tests/netiot03.prg b/contrib/hbnetio/tests/netiot03.prg similarity index 100% rename from harbour/contrib/hbnetio/tests/netiot03.prg rename to contrib/hbnetio/tests/netiot03.prg diff --git a/harbour/contrib/hbnetio/tests/netiotst.prg b/contrib/hbnetio/tests/netiotst.prg similarity index 100% rename from harbour/contrib/hbnetio/tests/netiotst.prg rename to contrib/hbnetio/tests/netiotst.prg diff --git a/harbour/contrib/hbnetio/utils/hbnetio/hbnetio.hbp b/contrib/hbnetio/utils/hbnetio/hbnetio.hbp similarity index 100% rename from harbour/contrib/hbnetio/utils/hbnetio/hbnetio.hbp rename to contrib/hbnetio/utils/hbnetio/hbnetio.hbp diff --git a/harbour/contrib/hbnetio/utils/hbnetio/modules.hbp b/contrib/hbnetio/utils/hbnetio/modules.hbp similarity index 100% rename from harbour/contrib/hbnetio/utils/hbnetio/modules.hbp rename to contrib/hbnetio/utils/hbnetio/modules.hbp diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiocon.prg b/contrib/hbnetio/utils/hbnetio/netiocon.prg similarity index 100% rename from harbour/contrib/hbnetio/utils/hbnetio/netiocon.prg rename to contrib/hbnetio/utils/hbnetio/netiocon.prg diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiomgm.hb b/contrib/hbnetio/utils/hbnetio/netiomgm.hb similarity index 100% rename from harbour/contrib/hbnetio/utils/hbnetio/netiomgm.hb rename to contrib/hbnetio/utils/hbnetio/netiomgm.hb diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg b/contrib/hbnetio/utils/hbnetio/netiosrv.prg similarity index 100% rename from harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg rename to contrib/hbnetio/utils/hbnetio/netiosrv.prg diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiosvc.prg b/contrib/hbnetio/utils/hbnetio/netiosvc.prg similarity index 100% rename from harbour/contrib/hbnetio/utils/hbnetio/netiosvc.prg rename to contrib/hbnetio/utils/hbnetio/netiosvc.prg diff --git a/harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hb b/contrib/hbnetio/utils/hbnetio/rpcdemo.hb similarity index 100% rename from harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hb rename to contrib/hbnetio/utils/hbnetio/rpcdemo.hb diff --git a/harbour/contrib/hbnf/aading.prg b/contrib/hbnf/aading.prg similarity index 100% rename from harbour/contrib/hbnf/aading.prg rename to contrib/hbnf/aading.prg diff --git a/harbour/contrib/hbnf/aavg.prg b/contrib/hbnf/aavg.prg similarity index 100% rename from harbour/contrib/hbnf/aavg.prg rename to contrib/hbnf/aavg.prg diff --git a/harbour/contrib/hbnf/acctadj.prg b/contrib/hbnf/acctadj.prg similarity index 100% rename from harbour/contrib/hbnf/acctadj.prg rename to contrib/hbnf/acctadj.prg diff --git a/harbour/contrib/hbnf/acctmnth.prg b/contrib/hbnf/acctmnth.prg similarity index 100% rename from harbour/contrib/hbnf/acctmnth.prg rename to contrib/hbnf/acctmnth.prg diff --git a/harbour/contrib/hbnf/acctqtr.prg b/contrib/hbnf/acctqtr.prg similarity index 100% rename from harbour/contrib/hbnf/acctqtr.prg rename to contrib/hbnf/acctqtr.prg diff --git a/harbour/contrib/hbnf/acctweek.prg b/contrib/hbnf/acctweek.prg similarity index 100% rename from harbour/contrib/hbnf/acctweek.prg rename to contrib/hbnf/acctweek.prg diff --git a/harbour/contrib/hbnf/acctyear.prg b/contrib/hbnf/acctyear.prg similarity index 100% rename from harbour/contrib/hbnf/acctyear.prg rename to contrib/hbnf/acctyear.prg diff --git a/harbour/contrib/hbnf/adapter.prg b/contrib/hbnf/adapter.prg similarity index 100% rename from harbour/contrib/hbnf/adapter.prg rename to contrib/hbnf/adapter.prg diff --git a/harbour/contrib/hbnf/adessort.prg b/contrib/hbnf/adessort.prg similarity index 100% rename from harbour/contrib/hbnf/adessort.prg rename to contrib/hbnf/adessort.prg diff --git a/harbour/contrib/hbnf/aemaxlen.prg b/contrib/hbnf/aemaxlen.prg similarity index 100% rename from harbour/contrib/hbnf/aemaxlen.prg rename to contrib/hbnf/aemaxlen.prg diff --git a/harbour/contrib/hbnf/aeminlen.prg b/contrib/hbnf/aeminlen.prg similarity index 100% rename from harbour/contrib/hbnf/aeminlen.prg rename to contrib/hbnf/aeminlen.prg diff --git a/harbour/contrib/hbnf/alt.c b/contrib/hbnf/alt.c similarity index 100% rename from harbour/contrib/hbnf/alt.c rename to contrib/hbnf/alt.c diff --git a/harbour/contrib/hbnf/amedian.prg b/contrib/hbnf/amedian.prg similarity index 100% rename from harbour/contrib/hbnf/amedian.prg rename to contrib/hbnf/amedian.prg diff --git a/harbour/contrib/hbnf/anomatch.prg b/contrib/hbnf/anomatch.prg similarity index 100% rename from harbour/contrib/hbnf/anomatch.prg rename to contrib/hbnf/anomatch.prg diff --git a/harbour/contrib/hbnf/any2any.prg b/contrib/hbnf/any2any.prg similarity index 100% rename from harbour/contrib/hbnf/any2any.prg rename to contrib/hbnf/any2any.prg diff --git a/harbour/contrib/hbnf/aredit.prg b/contrib/hbnf/aredit.prg similarity index 100% rename from harbour/contrib/hbnf/aredit.prg rename to contrib/hbnf/aredit.prg diff --git a/harbour/contrib/hbnf/asum.prg b/contrib/hbnf/asum.prg similarity index 100% rename from harbour/contrib/hbnf/asum.prg rename to contrib/hbnf/asum.prg diff --git a/harbour/contrib/hbnf/at2.prg b/contrib/hbnf/at2.prg similarity index 100% rename from harbour/contrib/hbnf/at2.prg rename to contrib/hbnf/at2.prg diff --git a/harbour/contrib/hbnf/bitclr.prg b/contrib/hbnf/bitclr.prg similarity index 100% rename from harbour/contrib/hbnf/bitclr.prg rename to contrib/hbnf/bitclr.prg diff --git a/harbour/contrib/hbnf/bitset.prg b/contrib/hbnf/bitset.prg similarity index 100% rename from harbour/contrib/hbnf/bitset.prg rename to contrib/hbnf/bitset.prg diff --git a/harbour/contrib/hbnf/blink.prg b/contrib/hbnf/blink.prg similarity index 100% rename from harbour/contrib/hbnf/blink.prg rename to contrib/hbnf/blink.prg diff --git a/harbour/contrib/hbnf/byt2bit.prg b/contrib/hbnf/byt2bit.prg similarity index 100% rename from harbour/contrib/hbnf/byt2bit.prg rename to contrib/hbnf/byt2bit.prg diff --git a/harbour/contrib/hbnf/byt2hex.prg b/contrib/hbnf/byt2hex.prg similarity index 100% rename from harbour/contrib/hbnf/byt2hex.prg rename to contrib/hbnf/byt2hex.prg diff --git a/harbour/contrib/hbnf/byteand.prg b/contrib/hbnf/byteand.prg similarity index 100% rename from harbour/contrib/hbnf/byteand.prg rename to contrib/hbnf/byteand.prg diff --git a/harbour/contrib/hbnf/byteneg.prg b/contrib/hbnf/byteneg.prg similarity index 100% rename from harbour/contrib/hbnf/byteneg.prg rename to contrib/hbnf/byteneg.prg diff --git a/harbour/contrib/hbnf/bytenot.prg b/contrib/hbnf/bytenot.prg similarity index 100% rename from harbour/contrib/hbnf/bytenot.prg rename to contrib/hbnf/bytenot.prg diff --git a/harbour/contrib/hbnf/byteor.prg b/contrib/hbnf/byteor.prg similarity index 100% rename from harbour/contrib/hbnf/byteor.prg rename to contrib/hbnf/byteor.prg diff --git a/harbour/contrib/hbnf/bytexor.prg b/contrib/hbnf/bytexor.prg similarity index 100% rename from harbour/contrib/hbnf/bytexor.prg rename to contrib/hbnf/bytexor.prg diff --git a/harbour/contrib/hbnf/calendar.prg b/contrib/hbnf/calendar.prg similarity index 100% rename from harbour/contrib/hbnf/calendar.prg rename to contrib/hbnf/calendar.prg diff --git a/harbour/contrib/hbnf/caplock.c b/contrib/hbnf/caplock.c similarity index 100% rename from harbour/contrib/hbnf/caplock.c rename to contrib/hbnf/caplock.c diff --git a/harbour/contrib/hbnf/chdir.c b/contrib/hbnf/chdir.c similarity index 100% rename from harbour/contrib/hbnf/chdir.c rename to contrib/hbnf/chdir.c diff --git a/harbour/contrib/hbnf/cint86.c b/contrib/hbnf/cint86.c similarity index 100% rename from harbour/contrib/hbnf/cint86.c rename to contrib/hbnf/cint86.c diff --git a/harbour/contrib/hbnf/clrsel.prg b/contrib/hbnf/clrsel.prg similarity index 100% rename from harbour/contrib/hbnf/clrsel.prg rename to contrib/hbnf/clrsel.prg diff --git a/harbour/contrib/hbnf/cntryset.prg b/contrib/hbnf/cntryset.prg similarity index 100% rename from harbour/contrib/hbnf/cntryset.prg rename to contrib/hbnf/cntryset.prg diff --git a/harbour/contrib/hbnf/color2n.c b/contrib/hbnf/color2n.c similarity index 100% rename from harbour/contrib/hbnf/color2n.c rename to contrib/hbnf/color2n.c diff --git a/harbour/contrib/hbnf/ctrl.c b/contrib/hbnf/ctrl.c similarity index 100% rename from harbour/contrib/hbnf/ctrl.c rename to contrib/hbnf/ctrl.c diff --git a/harbour/contrib/hbnf/d2e.prg b/contrib/hbnf/d2e.prg similarity index 100% rename from harbour/contrib/hbnf/d2e.prg rename to contrib/hbnf/d2e.prg diff --git a/harbour/contrib/hbnf/datecnfg.prg b/contrib/hbnf/datecnfg.prg similarity index 100% rename from harbour/contrib/hbnf/datecnfg.prg rename to contrib/hbnf/datecnfg.prg diff --git a/harbour/contrib/hbnf/dayofyr.prg b/contrib/hbnf/dayofyr.prg similarity index 100% rename from harbour/contrib/hbnf/dayofyr.prg rename to contrib/hbnf/dayofyr.prg diff --git a/harbour/contrib/hbnf/daytobow.prg b/contrib/hbnf/daytobow.prg similarity index 100% rename from harbour/contrib/hbnf/daytobow.prg rename to contrib/hbnf/daytobow.prg diff --git a/harbour/contrib/hbnf/dectobin.prg b/contrib/hbnf/dectobin.prg similarity index 100% rename from harbour/contrib/hbnf/dectobin.prg rename to contrib/hbnf/dectobin.prg diff --git a/harbour/contrib/hbnf/default.prg b/contrib/hbnf/default.prg similarity index 100% rename from harbour/contrib/hbnf/default.prg rename to contrib/hbnf/default.prg diff --git a/harbour/contrib/hbnf/descendn.c b/contrib/hbnf/descendn.c similarity index 100% rename from harbour/contrib/hbnf/descendn.c rename to contrib/hbnf/descendn.c diff --git a/harbour/contrib/hbnf/dfile.prg b/contrib/hbnf/dfile.prg similarity index 100% rename from harbour/contrib/hbnf/dfile.prg rename to contrib/hbnf/dfile.prg diff --git a/harbour/contrib/hbnf/dhkey.h b/contrib/hbnf/dhkey.h similarity index 100% rename from harbour/contrib/hbnf/dhkey.h rename to contrib/hbnf/dhkey.h diff --git a/harbour/contrib/hbnf/diskfunc.prg b/contrib/hbnf/diskfunc.prg similarity index 100% rename from harbour/contrib/hbnf/diskfunc.prg rename to contrib/hbnf/diskfunc.prg diff --git a/harbour/contrib/hbnf/dispc.c b/contrib/hbnf/dispc.c similarity index 100% rename from harbour/contrib/hbnf/dispc.c rename to contrib/hbnf/dispc.c diff --git a/harbour/contrib/hbnf/dispmsg.prg b/contrib/hbnf/dispmsg.prg similarity index 100% rename from harbour/contrib/hbnf/dispmsg.prg rename to contrib/hbnf/dispmsg.prg diff --git a/harbour/contrib/hbnf/doc/en/aading.txt b/contrib/hbnf/doc/en/aading.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/aading.txt rename to contrib/hbnf/doc/en/aading.txt diff --git a/harbour/contrib/hbnf/doc/en/aavg.txt b/contrib/hbnf/doc/en/aavg.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/aavg.txt rename to contrib/hbnf/doc/en/aavg.txt diff --git a/harbour/contrib/hbnf/doc/en/acctadj.txt b/contrib/hbnf/doc/en/acctadj.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/acctadj.txt rename to contrib/hbnf/doc/en/acctadj.txt diff --git a/harbour/contrib/hbnf/doc/en/acctmnth.txt b/contrib/hbnf/doc/en/acctmnth.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/acctmnth.txt rename to contrib/hbnf/doc/en/acctmnth.txt diff --git a/harbour/contrib/hbnf/doc/en/acctqtr.txt b/contrib/hbnf/doc/en/acctqtr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/acctqtr.txt rename to contrib/hbnf/doc/en/acctqtr.txt diff --git a/harbour/contrib/hbnf/doc/en/acctweek.txt b/contrib/hbnf/doc/en/acctweek.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/acctweek.txt rename to contrib/hbnf/doc/en/acctweek.txt diff --git a/harbour/contrib/hbnf/doc/en/acctyear.txt b/contrib/hbnf/doc/en/acctyear.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/acctyear.txt rename to contrib/hbnf/doc/en/acctyear.txt diff --git a/harbour/contrib/hbnf/doc/en/adapter.txt b/contrib/hbnf/doc/en/adapter.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/adapter.txt rename to contrib/hbnf/doc/en/adapter.txt diff --git a/harbour/contrib/hbnf/doc/en/adessort.txt b/contrib/hbnf/doc/en/adessort.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/adessort.txt rename to contrib/hbnf/doc/en/adessort.txt diff --git a/harbour/contrib/hbnf/doc/en/aemaxlen.txt b/contrib/hbnf/doc/en/aemaxlen.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/aemaxlen.txt rename to contrib/hbnf/doc/en/aemaxlen.txt diff --git a/harbour/contrib/hbnf/doc/en/aeminlen.txt b/contrib/hbnf/doc/en/aeminlen.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/aeminlen.txt rename to contrib/hbnf/doc/en/aeminlen.txt diff --git a/harbour/contrib/hbnf/doc/en/alt.txt b/contrib/hbnf/doc/en/alt.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/alt.txt rename to contrib/hbnf/doc/en/alt.txt diff --git a/harbour/contrib/hbnf/doc/en/amedian.txt b/contrib/hbnf/doc/en/amedian.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/amedian.txt rename to contrib/hbnf/doc/en/amedian.txt diff --git a/harbour/contrib/hbnf/doc/en/anomatch.txt b/contrib/hbnf/doc/en/anomatch.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/anomatch.txt rename to contrib/hbnf/doc/en/anomatch.txt diff --git a/harbour/contrib/hbnf/doc/en/any2any.txt b/contrib/hbnf/doc/en/any2any.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/any2any.txt rename to contrib/hbnf/doc/en/any2any.txt diff --git a/harbour/contrib/hbnf/doc/en/aredit.txt b/contrib/hbnf/doc/en/aredit.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/aredit.txt rename to contrib/hbnf/doc/en/aredit.txt diff --git a/harbour/contrib/hbnf/doc/en/asum.txt b/contrib/hbnf/doc/en/asum.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/asum.txt rename to contrib/hbnf/doc/en/asum.txt diff --git a/harbour/contrib/hbnf/doc/en/at2.txt b/contrib/hbnf/doc/en/at2.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/at2.txt rename to contrib/hbnf/doc/en/at2.txt diff --git a/harbour/contrib/hbnf/doc/en/bitclr.txt b/contrib/hbnf/doc/en/bitclr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/bitclr.txt rename to contrib/hbnf/doc/en/bitclr.txt diff --git a/harbour/contrib/hbnf/doc/en/bitset.txt b/contrib/hbnf/doc/en/bitset.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/bitset.txt rename to contrib/hbnf/doc/en/bitset.txt diff --git a/harbour/contrib/hbnf/doc/en/blink.txt b/contrib/hbnf/doc/en/blink.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/blink.txt rename to contrib/hbnf/doc/en/blink.txt diff --git a/harbour/contrib/hbnf/doc/en/byt2bit.txt b/contrib/hbnf/doc/en/byt2bit.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/byt2bit.txt rename to contrib/hbnf/doc/en/byt2bit.txt diff --git a/harbour/contrib/hbnf/doc/en/byt2hex.txt b/contrib/hbnf/doc/en/byt2hex.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/byt2hex.txt rename to contrib/hbnf/doc/en/byt2hex.txt diff --git a/harbour/contrib/hbnf/doc/en/byteand.txt b/contrib/hbnf/doc/en/byteand.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/byteand.txt rename to contrib/hbnf/doc/en/byteand.txt diff --git a/harbour/contrib/hbnf/doc/en/byteneg.txt b/contrib/hbnf/doc/en/byteneg.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/byteneg.txt rename to contrib/hbnf/doc/en/byteneg.txt diff --git a/harbour/contrib/hbnf/doc/en/bytenot.txt b/contrib/hbnf/doc/en/bytenot.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/bytenot.txt rename to contrib/hbnf/doc/en/bytenot.txt diff --git a/harbour/contrib/hbnf/doc/en/byteor.txt b/contrib/hbnf/doc/en/byteor.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/byteor.txt rename to contrib/hbnf/doc/en/byteor.txt diff --git a/harbour/contrib/hbnf/doc/en/bytexor.txt b/contrib/hbnf/doc/en/bytexor.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/bytexor.txt rename to contrib/hbnf/doc/en/bytexor.txt diff --git a/harbour/contrib/hbnf/doc/en/calendar.txt b/contrib/hbnf/doc/en/calendar.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/calendar.txt rename to contrib/hbnf/doc/en/calendar.txt diff --git a/harbour/contrib/hbnf/doc/en/caplock.txt b/contrib/hbnf/doc/en/caplock.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/caplock.txt rename to contrib/hbnf/doc/en/caplock.txt diff --git a/harbour/contrib/hbnf/doc/en/chdir.txt b/contrib/hbnf/doc/en/chdir.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/chdir.txt rename to contrib/hbnf/doc/en/chdir.txt diff --git a/harbour/contrib/hbnf/doc/en/cint86.txt b/contrib/hbnf/doc/en/cint86.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/cint86.txt rename to contrib/hbnf/doc/en/cint86.txt diff --git a/harbour/contrib/hbnf/doc/en/clrsel.txt b/contrib/hbnf/doc/en/clrsel.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/clrsel.txt rename to contrib/hbnf/doc/en/clrsel.txt diff --git a/harbour/contrib/hbnf/doc/en/cntryset.txt b/contrib/hbnf/doc/en/cntryset.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/cntryset.txt rename to contrib/hbnf/doc/en/cntryset.txt diff --git a/harbour/contrib/hbnf/doc/en/color2n.txt b/contrib/hbnf/doc/en/color2n.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/color2n.txt rename to contrib/hbnf/doc/en/color2n.txt diff --git a/harbour/contrib/hbnf/doc/en/ctrl.txt b/contrib/hbnf/doc/en/ctrl.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/ctrl.txt rename to contrib/hbnf/doc/en/ctrl.txt diff --git a/harbour/contrib/hbnf/doc/en/d2e.txt b/contrib/hbnf/doc/en/d2e.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/d2e.txt rename to contrib/hbnf/doc/en/d2e.txt diff --git a/harbour/contrib/hbnf/doc/en/datecnfg.txt b/contrib/hbnf/doc/en/datecnfg.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/datecnfg.txt rename to contrib/hbnf/doc/en/datecnfg.txt diff --git a/harbour/contrib/hbnf/doc/en/dayofyr.txt b/contrib/hbnf/doc/en/dayofyr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/dayofyr.txt rename to contrib/hbnf/doc/en/dayofyr.txt diff --git a/harbour/contrib/hbnf/doc/en/daytobow.txt b/contrib/hbnf/doc/en/daytobow.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/daytobow.txt rename to contrib/hbnf/doc/en/daytobow.txt diff --git a/harbour/contrib/hbnf/doc/en/dectobin.txt b/contrib/hbnf/doc/en/dectobin.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/dectobin.txt rename to contrib/hbnf/doc/en/dectobin.txt diff --git a/harbour/contrib/hbnf/doc/en/default.txt b/contrib/hbnf/doc/en/default.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/default.txt rename to contrib/hbnf/doc/en/default.txt diff --git a/harbour/contrib/hbnf/doc/en/descendn.txt b/contrib/hbnf/doc/en/descendn.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/descendn.txt rename to contrib/hbnf/doc/en/descendn.txt diff --git a/harbour/contrib/hbnf/doc/en/dfile.txt b/contrib/hbnf/doc/en/dfile.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/dfile.txt rename to contrib/hbnf/doc/en/dfile.txt diff --git a/harbour/contrib/hbnf/doc/en/diskfunc.txt b/contrib/hbnf/doc/en/diskfunc.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/diskfunc.txt rename to contrib/hbnf/doc/en/diskfunc.txt diff --git a/harbour/contrib/hbnf/doc/en/dispc.txt b/contrib/hbnf/doc/en/dispc.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/dispc.txt rename to contrib/hbnf/doc/en/dispc.txt diff --git a/harbour/contrib/hbnf/doc/en/dispmsg.txt b/contrib/hbnf/doc/en/dispmsg.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/dispmsg.txt rename to contrib/hbnf/doc/en/dispmsg.txt diff --git a/harbour/contrib/hbnf/doc/en/dosver.txt b/contrib/hbnf/doc/en/dosver.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/dosver.txt rename to contrib/hbnf/doc/en/dosver.txt diff --git a/harbour/contrib/hbnf/doc/en/e2d.txt b/contrib/hbnf/doc/en/e2d.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/e2d.txt rename to contrib/hbnf/doc/en/e2d.txt diff --git a/harbour/contrib/hbnf/doc/en/easter.txt b/contrib/hbnf/doc/en/easter.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/easter.txt rename to contrib/hbnf/doc/en/easter.txt diff --git a/harbour/contrib/hbnf/doc/en/elapmil.txt b/contrib/hbnf/doc/en/elapmil.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/elapmil.txt rename to contrib/hbnf/doc/en/elapmil.txt diff --git a/harbour/contrib/hbnf/doc/en/elapsed.txt b/contrib/hbnf/doc/en/elapsed.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/elapsed.txt rename to contrib/hbnf/doc/en/elapsed.txt diff --git a/harbour/contrib/hbnf/doc/en/eltime.txt b/contrib/hbnf/doc/en/eltime.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/eltime.txt rename to contrib/hbnf/doc/en/eltime.txt diff --git a/harbour/contrib/hbnf/doc/en/findith.txt b/contrib/hbnf/doc/en/findith.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/findith.txt rename to contrib/hbnf/doc/en/findith.txt diff --git a/harbour/contrib/hbnf/doc/en/firstday.txt b/contrib/hbnf/doc/en/firstday.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/firstday.txt rename to contrib/hbnf/doc/en/firstday.txt diff --git a/harbour/contrib/hbnf/doc/en/floptst.txt b/contrib/hbnf/doc/en/floptst.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/floptst.txt rename to contrib/hbnf/doc/en/floptst.txt diff --git a/harbour/contrib/hbnf/doc/en/ftattr.txt b/contrib/hbnf/doc/en/ftattr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/ftattr.txt rename to contrib/hbnf/doc/en/ftattr.txt diff --git a/harbour/contrib/hbnf/doc/en/fttext.txt b/contrib/hbnf/doc/en/fttext.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/fttext.txt rename to contrib/hbnf/doc/en/fttext.txt diff --git a/harbour/contrib/hbnf/doc/en/gcd.txt b/contrib/hbnf/doc/en/gcd.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/gcd.txt rename to contrib/hbnf/doc/en/gcd.txt diff --git a/harbour/contrib/hbnf/doc/en/getenvrn.txt b/contrib/hbnf/doc/en/getenvrn.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/getenvrn.txt rename to contrib/hbnf/doc/en/getenvrn.txt diff --git a/harbour/contrib/hbnf/doc/en/hex2dec.txt b/contrib/hbnf/doc/en/hex2dec.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/hex2dec.txt rename to contrib/hbnf/doc/en/hex2dec.txt diff --git a/harbour/contrib/hbnf/doc/en/iamidle.txt b/contrib/hbnf/doc/en/iamidle.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/iamidle.txt rename to contrib/hbnf/doc/en/iamidle.txt diff --git a/harbour/contrib/hbnf/doc/en/idle.txt b/contrib/hbnf/doc/en/idle.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/idle.txt rename to contrib/hbnf/doc/en/idle.txt diff --git a/harbour/contrib/hbnf/doc/en/inp.txt b/contrib/hbnf/doc/en/inp.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/inp.txt rename to contrib/hbnf/doc/en/inp.txt diff --git a/harbour/contrib/hbnf/doc/en/invclr.txt b/contrib/hbnf/doc/en/invclr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/invclr.txt rename to contrib/hbnf/doc/en/invclr.txt diff --git a/harbour/contrib/hbnf/doc/en/isbit.txt b/contrib/hbnf/doc/en/isbit.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/isbit.txt rename to contrib/hbnf/doc/en/isbit.txt diff --git a/harbour/contrib/hbnf/doc/en/isbiton.txt b/contrib/hbnf/doc/en/isbiton.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/isbiton.txt rename to contrib/hbnf/doc/en/isbiton.txt diff --git a/harbour/contrib/hbnf/doc/en/isprint.txt b/contrib/hbnf/doc/en/isprint.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/isprint.txt rename to contrib/hbnf/doc/en/isprint.txt diff --git a/harbour/contrib/hbnf/doc/en/isshare.txt b/contrib/hbnf/doc/en/isshare.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/isshare.txt rename to contrib/hbnf/doc/en/isshare.txt diff --git a/harbour/contrib/hbnf/doc/en/kspeed.txt b/contrib/hbnf/doc/en/kspeed.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/kspeed.txt rename to contrib/hbnf/doc/en/kspeed.txt diff --git a/harbour/contrib/hbnf/doc/en/lastday.txt b/contrib/hbnf/doc/en/lastday.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/lastday.txt rename to contrib/hbnf/doc/en/lastday.txt diff --git a/harbour/contrib/hbnf/doc/en/linked.txt b/contrib/hbnf/doc/en/linked.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/linked.txt rename to contrib/hbnf/doc/en/linked.txt diff --git a/harbour/contrib/hbnf/doc/en/madd.txt b/contrib/hbnf/doc/en/madd.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/madd.txt rename to contrib/hbnf/doc/en/madd.txt diff --git a/harbour/contrib/hbnf/doc/en/menu1.txt b/contrib/hbnf/doc/en/menu1.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/menu1.txt rename to contrib/hbnf/doc/en/menu1.txt diff --git a/harbour/contrib/hbnf/doc/en/menutonf.txt b/contrib/hbnf/doc/en/menutonf.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/menutonf.txt rename to contrib/hbnf/doc/en/menutonf.txt diff --git a/harbour/contrib/hbnf/doc/en/metaph.txt b/contrib/hbnf/doc/en/metaph.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/metaph.txt rename to contrib/hbnf/doc/en/metaph.txt diff --git a/harbour/contrib/hbnf/doc/en/miltime.txt b/contrib/hbnf/doc/en/miltime.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/miltime.txt rename to contrib/hbnf/doc/en/miltime.txt diff --git a/harbour/contrib/hbnf/doc/en/min2dhm.txt b/contrib/hbnf/doc/en/min2dhm.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/min2dhm.txt rename to contrib/hbnf/doc/en/min2dhm.txt diff --git a/harbour/contrib/hbnf/doc/en/mkdir.txt b/contrib/hbnf/doc/en/mkdir.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/mkdir.txt rename to contrib/hbnf/doc/en/mkdir.txt diff --git a/harbour/contrib/hbnf/doc/en/month.txt b/contrib/hbnf/doc/en/month.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/month.txt rename to contrib/hbnf/doc/en/month.txt diff --git a/harbour/contrib/hbnf/doc/en/mouse1.txt b/contrib/hbnf/doc/en/mouse1.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/mouse1.txt rename to contrib/hbnf/doc/en/mouse1.txt diff --git a/harbour/contrib/hbnf/doc/en/n2color.txt b/contrib/hbnf/doc/en/n2color.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/n2color.txt rename to contrib/hbnf/doc/en/n2color.txt diff --git a/harbour/contrib/hbnf/doc/en/netpv.txt b/contrib/hbnf/doc/en/netpv.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/netpv.txt rename to contrib/hbnf/doc/en/netpv.txt diff --git a/harbour/contrib/hbnf/doc/en/nooccur.txt b/contrib/hbnf/doc/en/nooccur.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/nooccur.txt rename to contrib/hbnf/doc/en/nooccur.txt diff --git a/harbour/contrib/hbnf/doc/en/ntow.txt b/contrib/hbnf/doc/en/ntow.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/ntow.txt rename to contrib/hbnf/doc/en/ntow.txt diff --git a/harbour/contrib/hbnf/doc/en/numlock.txt b/contrib/hbnf/doc/en/numlock.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/numlock.txt rename to contrib/hbnf/doc/en/numlock.txt diff --git a/harbour/contrib/hbnf/doc/en/nwlstat.txt b/contrib/hbnf/doc/en/nwlstat.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/nwlstat.txt rename to contrib/hbnf/doc/en/nwlstat.txt diff --git a/harbour/contrib/hbnf/doc/en/nwsem.txt b/contrib/hbnf/doc/en/nwsem.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/nwsem.txt rename to contrib/hbnf/doc/en/nwsem.txt diff --git a/harbour/contrib/hbnf/doc/en/nwuid.txt b/contrib/hbnf/doc/en/nwuid.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/nwuid.txt rename to contrib/hbnf/doc/en/nwuid.txt diff --git a/harbour/contrib/hbnf/doc/en/ontick.txt b/contrib/hbnf/doc/en/ontick.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/ontick.txt rename to contrib/hbnf/doc/en/ontick.txt diff --git a/harbour/contrib/hbnf/doc/en/origin.txt b/contrib/hbnf/doc/en/origin.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/origin.txt rename to contrib/hbnf/doc/en/origin.txt diff --git a/harbour/contrib/hbnf/doc/en/outp.txt b/contrib/hbnf/doc/en/outp.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/outp.txt rename to contrib/hbnf/doc/en/outp.txt diff --git a/harbour/contrib/hbnf/doc/en/page.txt b/contrib/hbnf/doc/en/page.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/page.txt rename to contrib/hbnf/doc/en/page.txt diff --git a/harbour/contrib/hbnf/doc/en/pchr.txt b/contrib/hbnf/doc/en/pchr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/pchr.txt rename to contrib/hbnf/doc/en/pchr.txt diff --git a/harbour/contrib/hbnf/doc/en/peek.txt b/contrib/hbnf/doc/en/peek.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/peek.txt rename to contrib/hbnf/doc/en/peek.txt diff --git a/harbour/contrib/hbnf/doc/en/pegs.txt b/contrib/hbnf/doc/en/pegs.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/pegs.txt rename to contrib/hbnf/doc/en/pegs.txt diff --git a/harbour/contrib/hbnf/doc/en/pending.txt b/contrib/hbnf/doc/en/pending.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/pending.txt rename to contrib/hbnf/doc/en/pending.txt diff --git a/harbour/contrib/hbnf/doc/en/pickday.txt b/contrib/hbnf/doc/en/pickday.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/pickday.txt rename to contrib/hbnf/doc/en/pickday.txt diff --git a/harbour/contrib/hbnf/doc/en/poke.txt b/contrib/hbnf/doc/en/poke.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/poke.txt rename to contrib/hbnf/doc/en/poke.txt diff --git a/harbour/contrib/hbnf/doc/en/popadder.txt b/contrib/hbnf/doc/en/popadder.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/popadder.txt rename to contrib/hbnf/doc/en/popadder.txt diff --git a/harbour/contrib/hbnf/doc/en/proper.txt b/contrib/hbnf/doc/en/proper.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/proper.txt rename to contrib/hbnf/doc/en/proper.txt diff --git a/harbour/contrib/hbnf/doc/en/prtesc.txt b/contrib/hbnf/doc/en/prtesc.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/prtesc.txt rename to contrib/hbnf/doc/en/prtesc.txt diff --git a/harbour/contrib/hbnf/doc/en/prtscr.txt b/contrib/hbnf/doc/en/prtscr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/prtscr.txt rename to contrib/hbnf/doc/en/prtscr.txt diff --git a/harbour/contrib/hbnf/doc/en/putkey.txt b/contrib/hbnf/doc/en/putkey.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/putkey.txt rename to contrib/hbnf/doc/en/putkey.txt diff --git a/harbour/contrib/hbnf/doc/en/pvid.txt b/contrib/hbnf/doc/en/pvid.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/pvid.txt rename to contrib/hbnf/doc/en/pvid.txt diff --git a/harbour/contrib/hbnf/doc/en/qtr.txt b/contrib/hbnf/doc/en/qtr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/qtr.txt rename to contrib/hbnf/doc/en/qtr.txt diff --git a/harbour/contrib/hbnf/doc/en/rand1.txt b/contrib/hbnf/doc/en/rand1.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/rand1.txt rename to contrib/hbnf/doc/en/rand1.txt diff --git a/harbour/contrib/hbnf/doc/en/reboot.txt b/contrib/hbnf/doc/en/reboot.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/reboot.txt rename to contrib/hbnf/doc/en/reboot.txt diff --git a/harbour/contrib/hbnf/doc/en/restsets.txt b/contrib/hbnf/doc/en/restsets.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/restsets.txt rename to contrib/hbnf/doc/en/restsets.txt diff --git a/harbour/contrib/hbnf/doc/en/rmdir.txt b/contrib/hbnf/doc/en/rmdir.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/rmdir.txt rename to contrib/hbnf/doc/en/rmdir.txt diff --git a/harbour/contrib/hbnf/doc/en/round.txt b/contrib/hbnf/doc/en/round.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/round.txt rename to contrib/hbnf/doc/en/round.txt diff --git a/harbour/contrib/hbnf/doc/en/savearr.txt b/contrib/hbnf/doc/en/savearr.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/savearr.txt rename to contrib/hbnf/doc/en/savearr.txt diff --git a/harbour/contrib/hbnf/doc/en/savesets.txt b/contrib/hbnf/doc/en/savesets.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/savesets.txt rename to contrib/hbnf/doc/en/savesets.txt diff --git a/harbour/contrib/hbnf/doc/en/scancode.txt b/contrib/hbnf/doc/en/scancode.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/scancode.txt rename to contrib/hbnf/doc/en/scancode.txt diff --git a/harbour/contrib/hbnf/doc/en/scregion.txt b/contrib/hbnf/doc/en/scregion.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/scregion.txt rename to contrib/hbnf/doc/en/scregion.txt diff --git a/harbour/contrib/hbnf/doc/en/setdate.txt b/contrib/hbnf/doc/en/setdate.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/setdate.txt rename to contrib/hbnf/doc/en/setdate.txt diff --git a/harbour/contrib/hbnf/doc/en/setkeys.txt b/contrib/hbnf/doc/en/setkeys.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/setkeys.txt rename to contrib/hbnf/doc/en/setkeys.txt diff --git a/harbour/contrib/hbnf/doc/en/setlastk.txt b/contrib/hbnf/doc/en/setlastk.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/setlastk.txt rename to contrib/hbnf/doc/en/setlastk.txt diff --git a/harbour/contrib/hbnf/doc/en/settime.txt b/contrib/hbnf/doc/en/settime.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/settime.txt rename to contrib/hbnf/doc/en/settime.txt diff --git a/harbour/contrib/hbnf/doc/en/shadow.txt b/contrib/hbnf/doc/en/shadow.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/shadow.txt rename to contrib/hbnf/doc/en/shadow.txt diff --git a/harbour/contrib/hbnf/doc/en/shift.txt b/contrib/hbnf/doc/en/shift.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/shift.txt rename to contrib/hbnf/doc/en/shift.txt diff --git a/harbour/contrib/hbnf/doc/en/sinkey.txt b/contrib/hbnf/doc/en/sinkey.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/sinkey.txt rename to contrib/hbnf/doc/en/sinkey.txt diff --git a/harbour/contrib/hbnf/doc/en/sleep.txt b/contrib/hbnf/doc/en/sleep.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/sleep.txt rename to contrib/hbnf/doc/en/sleep.txt diff --git a/harbour/contrib/hbnf/doc/en/sqzn.txt b/contrib/hbnf/doc/en/sqzn.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/sqzn.txt rename to contrib/hbnf/doc/en/sqzn.txt diff --git a/harbour/contrib/hbnf/doc/en/stod.txt b/contrib/hbnf/doc/en/stod.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/stod.txt rename to contrib/hbnf/doc/en/stod.txt diff --git a/harbour/contrib/hbnf/doc/en/sysmem.txt b/contrib/hbnf/doc/en/sysmem.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/sysmem.txt rename to contrib/hbnf/doc/en/sysmem.txt diff --git a/harbour/contrib/hbnf/doc/en/tbwhile.txt b/contrib/hbnf/doc/en/tbwhile.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/tbwhile.txt rename to contrib/hbnf/doc/en/tbwhile.txt diff --git a/harbour/contrib/hbnf/doc/en/tempfile.txt b/contrib/hbnf/doc/en/tempfile.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/tempfile.txt rename to contrib/hbnf/doc/en/tempfile.txt diff --git a/harbour/contrib/hbnf/doc/en/vertmenu.txt b/contrib/hbnf/doc/en/vertmenu.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/vertmenu.txt rename to contrib/hbnf/doc/en/vertmenu.txt diff --git a/harbour/contrib/hbnf/doc/en/vidcur.txt b/contrib/hbnf/doc/en/vidcur.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/vidcur.txt rename to contrib/hbnf/doc/en/vidcur.txt diff --git a/harbour/contrib/hbnf/doc/en/video1.txt b/contrib/hbnf/doc/en/video1.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/video1.txt rename to contrib/hbnf/doc/en/video1.txt diff --git a/harbour/contrib/hbnf/doc/en/vidmode.txt b/contrib/hbnf/doc/en/vidmode.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/vidmode.txt rename to contrib/hbnf/doc/en/vidmode.txt diff --git a/harbour/contrib/hbnf/doc/en/wda.txt b/contrib/hbnf/doc/en/wda.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/wda.txt rename to contrib/hbnf/doc/en/wda.txt diff --git a/harbour/contrib/hbnf/doc/en/week.txt b/contrib/hbnf/doc/en/week.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/week.txt rename to contrib/hbnf/doc/en/week.txt diff --git a/harbour/contrib/hbnf/doc/en/workdays.txt b/contrib/hbnf/doc/en/workdays.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/workdays.txt rename to contrib/hbnf/doc/en/workdays.txt diff --git a/harbour/contrib/hbnf/doc/en/woy.txt b/contrib/hbnf/doc/en/woy.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/woy.txt rename to contrib/hbnf/doc/en/woy.txt diff --git a/harbour/contrib/hbnf/doc/en/xbox.txt b/contrib/hbnf/doc/en/xbox.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/xbox.txt rename to contrib/hbnf/doc/en/xbox.txt diff --git a/harbour/contrib/hbnf/doc/en/year.txt b/contrib/hbnf/doc/en/year.txt similarity index 100% rename from harbour/contrib/hbnf/doc/en/year.txt rename to contrib/hbnf/doc/en/year.txt diff --git a/harbour/contrib/hbnf/dosver.c b/contrib/hbnf/dosver.c similarity index 100% rename from harbour/contrib/hbnf/dosver.c rename to contrib/hbnf/dosver.c diff --git a/harbour/contrib/hbnf/e2d.prg b/contrib/hbnf/e2d.prg similarity index 100% rename from harbour/contrib/hbnf/e2d.prg rename to contrib/hbnf/e2d.prg diff --git a/harbour/contrib/hbnf/easter.prg b/contrib/hbnf/easter.prg similarity index 100% rename from harbour/contrib/hbnf/easter.prg rename to contrib/hbnf/easter.prg diff --git a/harbour/contrib/hbnf/elapmil.prg b/contrib/hbnf/elapmil.prg similarity index 100% rename from harbour/contrib/hbnf/elapmil.prg rename to contrib/hbnf/elapmil.prg diff --git a/harbour/contrib/hbnf/elapsed.prg b/contrib/hbnf/elapsed.prg similarity index 100% rename from harbour/contrib/hbnf/elapsed.prg rename to contrib/hbnf/elapsed.prg diff --git a/harbour/contrib/hbnf/eltime.prg b/contrib/hbnf/eltime.prg similarity index 100% rename from harbour/contrib/hbnf/eltime.prg rename to contrib/hbnf/eltime.prg diff --git a/harbour/contrib/hbnf/findith.prg b/contrib/hbnf/findith.prg similarity index 100% rename from harbour/contrib/hbnf/findith.prg rename to contrib/hbnf/findith.prg diff --git a/harbour/contrib/hbnf/firstday.prg b/contrib/hbnf/firstday.prg similarity index 100% rename from harbour/contrib/hbnf/firstday.prg rename to contrib/hbnf/firstday.prg diff --git a/harbour/contrib/hbnf/floptst.prg b/contrib/hbnf/floptst.prg similarity index 100% rename from harbour/contrib/hbnf/floptst.prg rename to contrib/hbnf/floptst.prg diff --git a/harbour/contrib/hbnf/ftattr.c b/contrib/hbnf/ftattr.c similarity index 100% rename from harbour/contrib/hbnf/ftattr.c rename to contrib/hbnf/ftattr.c diff --git a/harbour/contrib/hbnf/ftint86.ch b/contrib/hbnf/ftint86.ch similarity index 100% rename from harbour/contrib/hbnf/ftint86.ch rename to contrib/hbnf/ftint86.ch diff --git a/harbour/contrib/hbnf/ftmenuto.ch b/contrib/hbnf/ftmenuto.ch similarity index 100% rename from harbour/contrib/hbnf/ftmenuto.ch rename to contrib/hbnf/ftmenuto.ch diff --git a/harbour/contrib/hbnf/fttext.c b/contrib/hbnf/fttext.c similarity index 100% rename from harbour/contrib/hbnf/fttext.c rename to contrib/hbnf/fttext.c diff --git a/harbour/contrib/hbnf/gcd.prg b/contrib/hbnf/gcd.prg similarity index 100% rename from harbour/contrib/hbnf/gcd.prg rename to contrib/hbnf/gcd.prg diff --git a/harbour/contrib/hbnf/getenvrn.c b/contrib/hbnf/getenvrn.c similarity index 100% rename from harbour/contrib/hbnf/getenvrn.c rename to contrib/hbnf/getenvrn.c diff --git a/harbour/contrib/hbnf/hbnf.hbc b/contrib/hbnf/hbnf.hbc similarity index 100% rename from harbour/contrib/hbnf/hbnf.hbc rename to contrib/hbnf/hbnf.hbc diff --git a/harbour/contrib/hbnf/hbnf.hbp b/contrib/hbnf/hbnf.hbp similarity index 100% rename from harbour/contrib/hbnf/hbnf.hbp rename to contrib/hbnf/hbnf.hbp diff --git a/harbour/contrib/hbnf/hbnf.hbx b/contrib/hbnf/hbnf.hbx similarity index 100% rename from harbour/contrib/hbnf/hbnf.hbx rename to contrib/hbnf/hbnf.hbx diff --git a/harbour/contrib/hbnf/hex2dec.prg b/contrib/hbnf/hex2dec.prg similarity index 100% rename from harbour/contrib/hbnf/hex2dec.prg rename to contrib/hbnf/hex2dec.prg diff --git a/harbour/contrib/hbnf/iamidle.c b/contrib/hbnf/iamidle.c similarity index 100% rename from harbour/contrib/hbnf/iamidle.c rename to contrib/hbnf/iamidle.c diff --git a/harbour/contrib/hbnf/idle.c b/contrib/hbnf/idle.c similarity index 100% rename from harbour/contrib/hbnf/idle.c rename to contrib/hbnf/idle.c diff --git a/harbour/contrib/hbnf/invclr.prg b/contrib/hbnf/invclr.prg similarity index 100% rename from harbour/contrib/hbnf/invclr.prg rename to contrib/hbnf/invclr.prg diff --git a/harbour/contrib/hbnf/isbit.prg b/contrib/hbnf/isbit.prg similarity index 100% rename from harbour/contrib/hbnf/isbit.prg rename to contrib/hbnf/isbit.prg diff --git a/harbour/contrib/hbnf/isbiton.prg b/contrib/hbnf/isbiton.prg similarity index 100% rename from harbour/contrib/hbnf/isbiton.prg rename to contrib/hbnf/isbiton.prg diff --git a/harbour/contrib/hbnf/isprint.c b/contrib/hbnf/isprint.c similarity index 100% rename from harbour/contrib/hbnf/isprint.c rename to contrib/hbnf/isprint.c diff --git a/harbour/contrib/hbnf/isshare.c b/contrib/hbnf/isshare.c similarity index 100% rename from harbour/contrib/hbnf/isshare.c rename to contrib/hbnf/isshare.c diff --git a/harbour/contrib/hbnf/kspeed.c b/contrib/hbnf/kspeed.c similarity index 100% rename from harbour/contrib/hbnf/kspeed.c rename to contrib/hbnf/kspeed.c diff --git a/harbour/contrib/hbnf/lastday.prg b/contrib/hbnf/lastday.prg similarity index 100% rename from harbour/contrib/hbnf/lastday.prg rename to contrib/hbnf/lastday.prg diff --git a/harbour/contrib/hbnf/linked.prg b/contrib/hbnf/linked.prg similarity index 100% rename from harbour/contrib/hbnf/linked.prg rename to contrib/hbnf/linked.prg diff --git a/harbour/contrib/hbnf/madd.prg b/contrib/hbnf/madd.prg similarity index 100% rename from harbour/contrib/hbnf/madd.prg rename to contrib/hbnf/madd.prg diff --git a/harbour/contrib/hbnf/menu1.prg b/contrib/hbnf/menu1.prg similarity index 100% rename from harbour/contrib/hbnf/menu1.prg rename to contrib/hbnf/menu1.prg diff --git a/harbour/contrib/hbnf/menuto.prg b/contrib/hbnf/menuto.prg similarity index 100% rename from harbour/contrib/hbnf/menuto.prg rename to contrib/hbnf/menuto.prg diff --git a/harbour/contrib/hbnf/metaph.prg b/contrib/hbnf/metaph.prg similarity index 100% rename from harbour/contrib/hbnf/metaph.prg rename to contrib/hbnf/metaph.prg diff --git a/harbour/contrib/hbnf/miltime.prg b/contrib/hbnf/miltime.prg similarity index 100% rename from harbour/contrib/hbnf/miltime.prg rename to contrib/hbnf/miltime.prg diff --git a/harbour/contrib/hbnf/min2dhm.prg b/contrib/hbnf/min2dhm.prg similarity index 100% rename from harbour/contrib/hbnf/min2dhm.prg rename to contrib/hbnf/min2dhm.prg diff --git a/harbour/contrib/hbnf/mkdir.c b/contrib/hbnf/mkdir.c similarity index 100% rename from harbour/contrib/hbnf/mkdir.c rename to contrib/hbnf/mkdir.c diff --git a/harbour/contrib/hbnf/month.prg b/contrib/hbnf/month.prg similarity index 100% rename from harbour/contrib/hbnf/month.prg rename to contrib/hbnf/month.prg diff --git a/harbour/contrib/hbnf/mouse.c b/contrib/hbnf/mouse.c similarity index 100% rename from harbour/contrib/hbnf/mouse.c rename to contrib/hbnf/mouse.c diff --git a/harbour/contrib/hbnf/mouse1.prg b/contrib/hbnf/mouse1.prg similarity index 100% rename from harbour/contrib/hbnf/mouse1.prg rename to contrib/hbnf/mouse1.prg diff --git a/harbour/contrib/hbnf/n2color.c b/contrib/hbnf/n2color.c similarity index 100% rename from harbour/contrib/hbnf/n2color.c rename to contrib/hbnf/n2color.c diff --git a/harbour/contrib/hbnf/netpv.prg b/contrib/hbnf/netpv.prg similarity index 100% rename from harbour/contrib/hbnf/netpv.prg rename to contrib/hbnf/netpv.prg diff --git a/harbour/contrib/hbnf/nooccur.prg b/contrib/hbnf/nooccur.prg similarity index 100% rename from harbour/contrib/hbnf/nooccur.prg rename to contrib/hbnf/nooccur.prg diff --git a/harbour/contrib/hbnf/ntow.prg b/contrib/hbnf/ntow.prg similarity index 100% rename from harbour/contrib/hbnf/ntow.prg rename to contrib/hbnf/ntow.prg diff --git a/harbour/contrib/hbnf/numlock.c b/contrib/hbnf/numlock.c similarity index 100% rename from harbour/contrib/hbnf/numlock.c rename to contrib/hbnf/numlock.c diff --git a/harbour/contrib/hbnf/nwlstat.prg b/contrib/hbnf/nwlstat.prg similarity index 100% rename from harbour/contrib/hbnf/nwlstat.prg rename to contrib/hbnf/nwlstat.prg diff --git a/harbour/contrib/hbnf/nwsem.prg b/contrib/hbnf/nwsem.prg similarity index 100% rename from harbour/contrib/hbnf/nwsem.prg rename to contrib/hbnf/nwsem.prg diff --git a/harbour/contrib/hbnf/nwuid.prg b/contrib/hbnf/nwuid.prg similarity index 100% rename from harbour/contrib/hbnf/nwuid.prg rename to contrib/hbnf/nwuid.prg diff --git a/harbour/contrib/hbnf/ontick.prg b/contrib/hbnf/ontick.prg similarity index 100% rename from harbour/contrib/hbnf/ontick.prg rename to contrib/hbnf/ontick.prg diff --git a/harbour/contrib/hbnf/origin.c b/contrib/hbnf/origin.c similarity index 100% rename from harbour/contrib/hbnf/origin.c rename to contrib/hbnf/origin.c diff --git a/harbour/contrib/hbnf/page.c b/contrib/hbnf/page.c similarity index 100% rename from harbour/contrib/hbnf/page.c rename to contrib/hbnf/page.c diff --git a/harbour/contrib/hbnf/pchr.prg b/contrib/hbnf/pchr.prg similarity index 100% rename from harbour/contrib/hbnf/pchr.prg rename to contrib/hbnf/pchr.prg diff --git a/harbour/contrib/hbnf/peek.c b/contrib/hbnf/peek.c similarity index 100% rename from harbour/contrib/hbnf/peek.c rename to contrib/hbnf/peek.c diff --git a/harbour/contrib/hbnf/pegs.prg b/contrib/hbnf/pegs.prg similarity index 100% rename from harbour/contrib/hbnf/pegs.prg rename to contrib/hbnf/pegs.prg diff --git a/harbour/contrib/hbnf/pending.prg b/contrib/hbnf/pending.prg similarity index 100% rename from harbour/contrib/hbnf/pending.prg rename to contrib/hbnf/pending.prg diff --git a/harbour/contrib/hbnf/pickday.prg b/contrib/hbnf/pickday.prg similarity index 100% rename from harbour/contrib/hbnf/pickday.prg rename to contrib/hbnf/pickday.prg diff --git a/harbour/contrib/hbnf/popadder.prg b/contrib/hbnf/popadder.prg similarity index 100% rename from harbour/contrib/hbnf/popadder.prg rename to contrib/hbnf/popadder.prg diff --git a/harbour/contrib/hbnf/proper.c b/contrib/hbnf/proper.c similarity index 100% rename from harbour/contrib/hbnf/proper.c rename to contrib/hbnf/proper.c diff --git a/harbour/contrib/hbnf/prtesc.prg b/contrib/hbnf/prtesc.prg similarity index 100% rename from harbour/contrib/hbnf/prtesc.prg rename to contrib/hbnf/prtesc.prg diff --git a/harbour/contrib/hbnf/prtscr.c b/contrib/hbnf/prtscr.c similarity index 100% rename from harbour/contrib/hbnf/prtscr.c rename to contrib/hbnf/prtscr.c diff --git a/harbour/contrib/hbnf/putkey.c b/contrib/hbnf/putkey.c similarity index 100% rename from harbour/contrib/hbnf/putkey.c rename to contrib/hbnf/putkey.c diff --git a/harbour/contrib/hbnf/pvid.prg b/contrib/hbnf/pvid.prg similarity index 100% rename from harbour/contrib/hbnf/pvid.prg rename to contrib/hbnf/pvid.prg diff --git a/harbour/contrib/hbnf/qtr.prg b/contrib/hbnf/qtr.prg similarity index 100% rename from harbour/contrib/hbnf/qtr.prg rename to contrib/hbnf/qtr.prg diff --git a/harbour/contrib/hbnf/rand1.prg b/contrib/hbnf/rand1.prg similarity index 100% rename from harbour/contrib/hbnf/rand1.prg rename to contrib/hbnf/rand1.prg diff --git a/harbour/contrib/hbnf/restsets.prg b/contrib/hbnf/restsets.prg similarity index 100% rename from harbour/contrib/hbnf/restsets.prg rename to contrib/hbnf/restsets.prg diff --git a/harbour/contrib/hbnf/rmdir.c b/contrib/hbnf/rmdir.c similarity index 100% rename from harbour/contrib/hbnf/rmdir.c rename to contrib/hbnf/rmdir.c diff --git a/harbour/contrib/hbnf/round.prg b/contrib/hbnf/round.prg similarity index 100% rename from harbour/contrib/hbnf/round.prg rename to contrib/hbnf/round.prg diff --git a/harbour/contrib/hbnf/savearr.prg b/contrib/hbnf/savearr.prg similarity index 100% rename from harbour/contrib/hbnf/savearr.prg rename to contrib/hbnf/savearr.prg diff --git a/harbour/contrib/hbnf/savesets.prg b/contrib/hbnf/savesets.prg similarity index 100% rename from harbour/contrib/hbnf/savesets.prg rename to contrib/hbnf/savesets.prg diff --git a/harbour/contrib/hbnf/scancode.prg b/contrib/hbnf/scancode.prg similarity index 100% rename from harbour/contrib/hbnf/scancode.prg rename to contrib/hbnf/scancode.prg diff --git a/harbour/contrib/hbnf/scregion.prg b/contrib/hbnf/scregion.prg similarity index 100% rename from harbour/contrib/hbnf/scregion.prg rename to contrib/hbnf/scregion.prg diff --git a/harbour/contrib/hbnf/setdate.c b/contrib/hbnf/setdate.c similarity index 100% rename from harbour/contrib/hbnf/setdate.c rename to contrib/hbnf/setdate.c diff --git a/harbour/contrib/hbnf/setkeys.c b/contrib/hbnf/setkeys.c similarity index 100% rename from harbour/contrib/hbnf/setkeys.c rename to contrib/hbnf/setkeys.c diff --git a/harbour/contrib/hbnf/setlastk.c b/contrib/hbnf/setlastk.c similarity index 100% rename from harbour/contrib/hbnf/setlastk.c rename to contrib/hbnf/setlastk.c diff --git a/harbour/contrib/hbnf/settime.c b/contrib/hbnf/settime.c similarity index 100% rename from harbour/contrib/hbnf/settime.c rename to contrib/hbnf/settime.c diff --git a/harbour/contrib/hbnf/shadow.c b/contrib/hbnf/shadow.c similarity index 100% rename from harbour/contrib/hbnf/shadow.c rename to contrib/hbnf/shadow.c diff --git a/harbour/contrib/hbnf/shift.c b/contrib/hbnf/shift.c similarity index 100% rename from harbour/contrib/hbnf/shift.c rename to contrib/hbnf/shift.c diff --git a/harbour/contrib/hbnf/sinkey.prg b/contrib/hbnf/sinkey.prg similarity index 100% rename from harbour/contrib/hbnf/sinkey.prg rename to contrib/hbnf/sinkey.prg diff --git a/harbour/contrib/hbnf/sleep.prg b/contrib/hbnf/sleep.prg similarity index 100% rename from harbour/contrib/hbnf/sleep.prg rename to contrib/hbnf/sleep.prg diff --git a/harbour/contrib/hbnf/sqzn.prg b/contrib/hbnf/sqzn.prg similarity index 100% rename from harbour/contrib/hbnf/sqzn.prg rename to contrib/hbnf/sqzn.prg diff --git a/harbour/contrib/hbnf/stod.c b/contrib/hbnf/stod.c similarity index 100% rename from harbour/contrib/hbnf/stod.c rename to contrib/hbnf/stod.c diff --git a/harbour/contrib/hbnf/support.c b/contrib/hbnf/support.c similarity index 100% rename from harbour/contrib/hbnf/support.c rename to contrib/hbnf/support.c diff --git a/harbour/contrib/hbnf/sysmem.prg b/contrib/hbnf/sysmem.prg similarity index 100% rename from harbour/contrib/hbnf/sysmem.prg rename to contrib/hbnf/sysmem.prg diff --git a/harbour/contrib/hbnf/tbwhile.prg b/contrib/hbnf/tbwhile.prg similarity index 100% rename from harbour/contrib/hbnf/tbwhile.prg rename to contrib/hbnf/tbwhile.prg diff --git a/harbour/contrib/hbnf/tempfile.prg b/contrib/hbnf/tempfile.prg similarity index 100% rename from harbour/contrib/hbnf/tempfile.prg rename to contrib/hbnf/tempfile.prg diff --git a/harbour/contrib/hbnf/tests/aading.prg b/contrib/hbnf/tests/aading.prg similarity index 100% rename from harbour/contrib/hbnf/tests/aading.prg rename to contrib/hbnf/tests/aading.prg diff --git a/harbour/contrib/hbnf/tests/aemaxlen.prg b/contrib/hbnf/tests/aemaxlen.prg similarity index 100% rename from harbour/contrib/hbnf/tests/aemaxlen.prg rename to contrib/hbnf/tests/aemaxlen.prg diff --git a/harbour/contrib/hbnf/tests/aeminlen.prg b/contrib/hbnf/tests/aeminlen.prg similarity index 100% rename from harbour/contrib/hbnf/tests/aeminlen.prg rename to contrib/hbnf/tests/aeminlen.prg diff --git a/harbour/contrib/hbnf/tests/amedian.prg b/contrib/hbnf/tests/amedian.prg similarity index 100% rename from harbour/contrib/hbnf/tests/amedian.prg rename to contrib/hbnf/tests/amedian.prg diff --git a/harbour/contrib/hbnf/tests/aredit.prg b/contrib/hbnf/tests/aredit.prg similarity index 100% rename from harbour/contrib/hbnf/tests/aredit.prg rename to contrib/hbnf/tests/aredit.prg diff --git a/harbour/contrib/hbnf/tests/at2.prg b/contrib/hbnf/tests/at2.prg similarity index 100% rename from harbour/contrib/hbnf/tests/at2.prg rename to contrib/hbnf/tests/at2.prg diff --git a/harbour/contrib/hbnf/tests/blink.prg b/contrib/hbnf/tests/blink.prg similarity index 100% rename from harbour/contrib/hbnf/tests/blink.prg rename to contrib/hbnf/tests/blink.prg diff --git a/harbour/contrib/hbnf/tests/calendar.prg b/contrib/hbnf/tests/calendar.prg similarity index 100% rename from harbour/contrib/hbnf/tests/calendar.prg rename to contrib/hbnf/tests/calendar.prg diff --git a/harbour/contrib/hbnf/tests/clrsel.prg b/contrib/hbnf/tests/clrsel.prg similarity index 100% rename from harbour/contrib/hbnf/tests/clrsel.prg rename to contrib/hbnf/tests/clrsel.prg diff --git a/harbour/contrib/hbnf/tests/d2e.prg b/contrib/hbnf/tests/d2e.prg similarity index 100% rename from harbour/contrib/hbnf/tests/d2e.prg rename to contrib/hbnf/tests/d2e.prg diff --git a/harbour/contrib/hbnf/tests/datecnfg.prg b/contrib/hbnf/tests/datecnfg.prg similarity index 100% rename from harbour/contrib/hbnf/tests/datecnfg.prg rename to contrib/hbnf/tests/datecnfg.prg diff --git a/harbour/contrib/hbnf/tests/dectobin.prg b/contrib/hbnf/tests/dectobin.prg similarity index 100% rename from harbour/contrib/hbnf/tests/dectobin.prg rename to contrib/hbnf/tests/dectobin.prg diff --git a/harbour/contrib/hbnf/tests/dfile.prg b/contrib/hbnf/tests/dfile.prg similarity index 100% rename from harbour/contrib/hbnf/tests/dfile.prg rename to contrib/hbnf/tests/dfile.prg diff --git a/harbour/contrib/hbnf/tests/diskfunc.prg b/contrib/hbnf/tests/diskfunc.prg similarity index 100% rename from harbour/contrib/hbnf/tests/diskfunc.prg rename to contrib/hbnf/tests/diskfunc.prg diff --git a/harbour/contrib/hbnf/tests/dispmsg.prg b/contrib/hbnf/tests/dispmsg.prg similarity index 100% rename from harbour/contrib/hbnf/tests/dispmsg.prg rename to contrib/hbnf/tests/dispmsg.prg diff --git a/harbour/contrib/hbnf/tests/dosver.prg b/contrib/hbnf/tests/dosver.prg similarity index 100% rename from harbour/contrib/hbnf/tests/dosver.prg rename to contrib/hbnf/tests/dosver.prg diff --git a/harbour/contrib/hbnf/tests/e2d.prg b/contrib/hbnf/tests/e2d.prg similarity index 100% rename from harbour/contrib/hbnf/tests/e2d.prg rename to contrib/hbnf/tests/e2d.prg diff --git a/harbour/contrib/hbnf/tests/elapsed.prg b/contrib/hbnf/tests/elapsed.prg similarity index 100% rename from harbour/contrib/hbnf/tests/elapsed.prg rename to contrib/hbnf/tests/elapsed.prg diff --git a/harbour/contrib/hbnf/tests/findith.prg b/contrib/hbnf/tests/findith.prg similarity index 100% rename from harbour/contrib/hbnf/tests/findith.prg rename to contrib/hbnf/tests/findith.prg diff --git a/harbour/contrib/hbnf/tests/floptst.prg b/contrib/hbnf/tests/floptst.prg similarity index 100% rename from harbour/contrib/hbnf/tests/floptst.prg rename to contrib/hbnf/tests/floptst.prg diff --git a/harbour/contrib/hbnf/tests/fttext.prg b/contrib/hbnf/tests/fttext.prg similarity index 100% rename from harbour/contrib/hbnf/tests/fttext.prg rename to contrib/hbnf/tests/fttext.prg diff --git a/harbour/contrib/hbnf/tests/gcd.prg b/contrib/hbnf/tests/gcd.prg similarity index 100% rename from harbour/contrib/hbnf/tests/gcd.prg rename to contrib/hbnf/tests/gcd.prg diff --git a/harbour/contrib/hbnf/tests/getenvrn.prg b/contrib/hbnf/tests/getenvrn.prg similarity index 100% rename from harbour/contrib/hbnf/tests/getenvrn.prg rename to contrib/hbnf/tests/getenvrn.prg diff --git a/harbour/contrib/hbnf/tests/hbmk.hbm b/contrib/hbnf/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbnf/tests/hbmk.hbm rename to contrib/hbnf/tests/hbmk.hbm diff --git a/harbour/contrib/hbnf/tests/hex2dec.prg b/contrib/hbnf/tests/hex2dec.prg similarity index 100% rename from harbour/contrib/hbnf/tests/hex2dec.prg rename to contrib/hbnf/tests/hex2dec.prg diff --git a/harbour/contrib/hbnf/tests/isshare.prg b/contrib/hbnf/tests/isshare.prg similarity index 100% rename from harbour/contrib/hbnf/tests/isshare.prg rename to contrib/hbnf/tests/isshare.prg diff --git a/harbour/contrib/hbnf/tests/linked.prg b/contrib/hbnf/tests/linked.prg similarity index 100% rename from harbour/contrib/hbnf/tests/linked.prg rename to contrib/hbnf/tests/linked.prg diff --git a/harbour/contrib/hbnf/tests/menu1.prg b/contrib/hbnf/tests/menu1.prg similarity index 100% rename from harbour/contrib/hbnf/tests/menu1.prg rename to contrib/hbnf/tests/menu1.prg diff --git a/harbour/contrib/hbnf/tests/menuto.prg b/contrib/hbnf/tests/menuto.prg similarity index 100% rename from harbour/contrib/hbnf/tests/menuto.prg rename to contrib/hbnf/tests/menuto.prg diff --git a/harbour/contrib/hbnf/tests/metaph.prg b/contrib/hbnf/tests/metaph.prg similarity index 100% rename from harbour/contrib/hbnf/tests/metaph.prg rename to contrib/hbnf/tests/metaph.prg diff --git a/harbour/contrib/hbnf/tests/miltime.prg b/contrib/hbnf/tests/miltime.prg similarity index 100% rename from harbour/contrib/hbnf/tests/miltime.prg rename to contrib/hbnf/tests/miltime.prg diff --git a/harbour/contrib/hbnf/tests/mouse1.prg b/contrib/hbnf/tests/mouse1.prg similarity index 100% rename from harbour/contrib/hbnf/tests/mouse1.prg rename to contrib/hbnf/tests/mouse1.prg diff --git a/harbour/contrib/hbnf/tests/netpv.prg b/contrib/hbnf/tests/netpv.prg similarity index 100% rename from harbour/contrib/hbnf/tests/netpv.prg rename to contrib/hbnf/tests/netpv.prg diff --git a/harbour/contrib/hbnf/tests/ntow.prg b/contrib/hbnf/tests/ntow.prg similarity index 100% rename from harbour/contrib/hbnf/tests/ntow.prg rename to contrib/hbnf/tests/ntow.prg diff --git a/harbour/contrib/hbnf/tests/nwlstat.prg b/contrib/hbnf/tests/nwlstat.prg similarity index 100% rename from harbour/contrib/hbnf/tests/nwlstat.prg rename to contrib/hbnf/tests/nwlstat.prg diff --git a/harbour/contrib/hbnf/tests/nwsem.prg b/contrib/hbnf/tests/nwsem.prg similarity index 100% rename from harbour/contrib/hbnf/tests/nwsem.prg rename to contrib/hbnf/tests/nwsem.prg diff --git a/harbour/contrib/hbnf/tests/nwuid.prg b/contrib/hbnf/tests/nwuid.prg similarity index 100% rename from harbour/contrib/hbnf/tests/nwuid.prg rename to contrib/hbnf/tests/nwuid.prg diff --git a/harbour/contrib/hbnf/tests/ontick.prg b/contrib/hbnf/tests/ontick.prg similarity index 100% rename from harbour/contrib/hbnf/tests/ontick.prg rename to contrib/hbnf/tests/ontick.prg diff --git a/harbour/contrib/hbnf/tests/pegs.prg b/contrib/hbnf/tests/pegs.prg similarity index 100% rename from harbour/contrib/hbnf/tests/pegs.prg rename to contrib/hbnf/tests/pegs.prg diff --git a/harbour/contrib/hbnf/tests/pending.prg b/contrib/hbnf/tests/pending.prg similarity index 100% rename from harbour/contrib/hbnf/tests/pending.prg rename to contrib/hbnf/tests/pending.prg diff --git a/harbour/contrib/hbnf/tests/pickday.prg b/contrib/hbnf/tests/pickday.prg similarity index 100% rename from harbour/contrib/hbnf/tests/pickday.prg rename to contrib/hbnf/tests/pickday.prg diff --git a/harbour/contrib/hbnf/tests/popadder.prg b/contrib/hbnf/tests/popadder.prg similarity index 100% rename from harbour/contrib/hbnf/tests/popadder.prg rename to contrib/hbnf/tests/popadder.prg diff --git a/harbour/contrib/hbnf/tests/prtesc.prg b/contrib/hbnf/tests/prtesc.prg similarity index 100% rename from harbour/contrib/hbnf/tests/prtesc.prg rename to contrib/hbnf/tests/prtesc.prg diff --git a/harbour/contrib/hbnf/tests/rand1.prg b/contrib/hbnf/tests/rand1.prg similarity index 100% rename from harbour/contrib/hbnf/tests/rand1.prg rename to contrib/hbnf/tests/rand1.prg diff --git a/harbour/contrib/hbnf/tests/savearr.prg b/contrib/hbnf/tests/savearr.prg similarity index 100% rename from harbour/contrib/hbnf/tests/savearr.prg rename to contrib/hbnf/tests/savearr.prg diff --git a/harbour/contrib/hbnf/tests/savesets.prg b/contrib/hbnf/tests/savesets.prg similarity index 100% rename from harbour/contrib/hbnf/tests/savesets.prg rename to contrib/hbnf/tests/savesets.prg diff --git a/harbour/contrib/hbnf/tests/scancode.prg b/contrib/hbnf/tests/scancode.prg similarity index 100% rename from harbour/contrib/hbnf/tests/scancode.prg rename to contrib/hbnf/tests/scancode.prg diff --git a/harbour/contrib/hbnf/tests/setdate.prg b/contrib/hbnf/tests/setdate.prg similarity index 100% rename from harbour/contrib/hbnf/tests/setdate.prg rename to contrib/hbnf/tests/setdate.prg diff --git a/harbour/contrib/hbnf/tests/settime.prg b/contrib/hbnf/tests/settime.prg similarity index 100% rename from harbour/contrib/hbnf/tests/settime.prg rename to contrib/hbnf/tests/settime.prg diff --git a/harbour/contrib/hbnf/tests/sleep.prg b/contrib/hbnf/tests/sleep.prg similarity index 100% rename from harbour/contrib/hbnf/tests/sleep.prg rename to contrib/hbnf/tests/sleep.prg diff --git a/harbour/contrib/hbnf/tests/sysmem.prg b/contrib/hbnf/tests/sysmem.prg similarity index 100% rename from harbour/contrib/hbnf/tests/sysmem.prg rename to contrib/hbnf/tests/sysmem.prg diff --git a/harbour/contrib/hbnf/tests/tbwhile.prg b/contrib/hbnf/tests/tbwhile.prg similarity index 100% rename from harbour/contrib/hbnf/tests/tbwhile.prg rename to contrib/hbnf/tests/tbwhile.prg diff --git a/harbour/contrib/hbnf/tests/tempfile.prg b/contrib/hbnf/tests/tempfile.prg similarity index 100% rename from harbour/contrib/hbnf/tests/tempfile.prg rename to contrib/hbnf/tests/tempfile.prg diff --git a/harbour/contrib/hbnf/tests/test.prg b/contrib/hbnf/tests/test.prg similarity index 100% rename from harbour/contrib/hbnf/tests/test.prg rename to contrib/hbnf/tests/test.prg diff --git a/harbour/contrib/hbnf/tests/vertmenu.prg b/contrib/hbnf/tests/vertmenu.prg similarity index 100% rename from harbour/contrib/hbnf/tests/vertmenu.prg rename to contrib/hbnf/tests/vertmenu.prg diff --git a/harbour/contrib/hbnf/tests/vidmode.prg b/contrib/hbnf/tests/vidmode.prg similarity index 100% rename from harbour/contrib/hbnf/tests/vidmode.prg rename to contrib/hbnf/tests/vidmode.prg diff --git a/harbour/contrib/hbnf/tests/wda.prg b/contrib/hbnf/tests/wda.prg similarity index 100% rename from harbour/contrib/hbnf/tests/wda.prg rename to contrib/hbnf/tests/wda.prg diff --git a/harbour/contrib/hbnf/tests/workdays.prg b/contrib/hbnf/tests/workdays.prg similarity index 100% rename from harbour/contrib/hbnf/tests/workdays.prg rename to contrib/hbnf/tests/workdays.prg diff --git a/harbour/contrib/hbnf/tests/woy.prg b/contrib/hbnf/tests/woy.prg similarity index 100% rename from harbour/contrib/hbnf/tests/woy.prg rename to contrib/hbnf/tests/woy.prg diff --git a/harbour/contrib/hbnf/tests/xbox.prg b/contrib/hbnf/tests/xbox.prg similarity index 100% rename from harbour/contrib/hbnf/tests/xbox.prg rename to contrib/hbnf/tests/xbox.prg diff --git a/harbour/contrib/hbnf/vertmenu.prg b/contrib/hbnf/vertmenu.prg similarity index 100% rename from harbour/contrib/hbnf/vertmenu.prg rename to contrib/hbnf/vertmenu.prg diff --git a/harbour/contrib/hbnf/vidcur.prg b/contrib/hbnf/vidcur.prg similarity index 100% rename from harbour/contrib/hbnf/vidcur.prg rename to contrib/hbnf/vidcur.prg diff --git a/harbour/contrib/hbnf/video1.c b/contrib/hbnf/video1.c similarity index 100% rename from harbour/contrib/hbnf/video1.c rename to contrib/hbnf/video1.c diff --git a/harbour/contrib/hbnf/video2.prg b/contrib/hbnf/video2.prg similarity index 100% rename from harbour/contrib/hbnf/video2.prg rename to contrib/hbnf/video2.prg diff --git a/harbour/contrib/hbnf/vidmode.c b/contrib/hbnf/vidmode.c similarity index 100% rename from harbour/contrib/hbnf/vidmode.c rename to contrib/hbnf/vidmode.c diff --git a/harbour/contrib/hbnf/wda.prg b/contrib/hbnf/wda.prg similarity index 100% rename from harbour/contrib/hbnf/wda.prg rename to contrib/hbnf/wda.prg diff --git a/harbour/contrib/hbnf/week.prg b/contrib/hbnf/week.prg similarity index 100% rename from harbour/contrib/hbnf/week.prg rename to contrib/hbnf/week.prg diff --git a/harbour/contrib/hbnf/workdays.prg b/contrib/hbnf/workdays.prg similarity index 100% rename from harbour/contrib/hbnf/workdays.prg rename to contrib/hbnf/workdays.prg diff --git a/harbour/contrib/hbnf/woy.prg b/contrib/hbnf/woy.prg similarity index 100% rename from harbour/contrib/hbnf/woy.prg rename to contrib/hbnf/woy.prg diff --git a/harbour/contrib/hbnf/xbox.prg b/contrib/hbnf/xbox.prg similarity index 100% rename from harbour/contrib/hbnf/xbox.prg rename to contrib/hbnf/xbox.prg diff --git a/harbour/contrib/hbnf/year.prg b/contrib/hbnf/year.prg similarity index 100% rename from harbour/contrib/hbnf/year.prg rename to contrib/hbnf/year.prg diff --git a/harbour/contrib/hbodbc/browodbc.prg b/contrib/hbodbc/browodbc.prg similarity index 100% rename from harbour/contrib/hbodbc/browodbc.prg rename to contrib/hbodbc/browodbc.prg diff --git a/harbour/contrib/hbodbc/hbodbc.hbc b/contrib/hbodbc/hbodbc.hbc similarity index 100% rename from harbour/contrib/hbodbc/hbodbc.hbc rename to contrib/hbodbc/hbodbc.hbc diff --git a/harbour/contrib/hbodbc/hbodbc.hbp b/contrib/hbodbc/hbodbc.hbp similarity index 100% rename from harbour/contrib/hbodbc/hbodbc.hbp rename to contrib/hbodbc/hbodbc.hbp diff --git a/harbour/contrib/hbodbc/hbodbc.hbx b/contrib/hbodbc/hbodbc.hbx similarity index 100% rename from harbour/contrib/hbodbc/hbodbc.hbx rename to contrib/hbodbc/hbodbc.hbx diff --git a/harbour/contrib/hbodbc/odbc.c b/contrib/hbodbc/odbc.c similarity index 100% rename from harbour/contrib/hbodbc/odbc.c rename to contrib/hbodbc/odbc.c diff --git a/harbour/contrib/hbodbc/sql.ch b/contrib/hbodbc/sql.ch similarity index 100% rename from harbour/contrib/hbodbc/sql.ch rename to contrib/hbodbc/sql.ch diff --git a/harbour/contrib/hbodbc/tests/hbmk.hbm b/contrib/hbodbc/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbodbc/tests/hbmk.hbm rename to contrib/hbodbc/tests/hbmk.hbm diff --git a/harbour/contrib/hbodbc/tests/odbc.prg b/contrib/hbodbc/tests/odbc.prg similarity index 100% rename from harbour/contrib/hbodbc/tests/odbc.prg rename to contrib/hbodbc/tests/odbc.prg diff --git a/harbour/contrib/hbodbc/tests/odbccall.prg b/contrib/hbodbc/tests/odbccall.prg similarity index 100% rename from harbour/contrib/hbodbc/tests/odbccall.prg rename to contrib/hbodbc/tests/odbccall.prg diff --git a/harbour/contrib/hbodbc/tests/test.mdb b/contrib/hbodbc/tests/test.mdb similarity index 100% rename from harbour/contrib/hbodbc/tests/test.mdb rename to contrib/hbodbc/tests/test.mdb diff --git a/harbour/contrib/hbodbc/tests/todbc.prg b/contrib/hbodbc/tests/todbc.prg similarity index 100% rename from harbour/contrib/hbodbc/tests/todbc.prg rename to contrib/hbodbc/tests/todbc.prg diff --git a/harbour/contrib/hbodbc/todbc.prg b/contrib/hbodbc/todbc.prg similarity index 100% rename from harbour/contrib/hbodbc/todbc.prg rename to contrib/hbodbc/todbc.prg diff --git a/harbour/contrib/hboslib/core.prg b/contrib/hboslib/core.prg similarity index 100% rename from harbour/contrib/hboslib/core.prg rename to contrib/hboslib/core.prg diff --git a/harbour/contrib/hboslib/hboslib.hbc b/contrib/hboslib/hboslib.hbc similarity index 100% rename from harbour/contrib/hboslib/hboslib.hbc rename to contrib/hboslib/hboslib.hbc diff --git a/harbour/contrib/hboslib/hboslib.hbp b/contrib/hboslib/hboslib.hbp similarity index 100% rename from harbour/contrib/hboslib/hboslib.hbp rename to contrib/hboslib/hboslib.hbp diff --git a/harbour/contrib/hboslib/hboslib.hbx b/contrib/hboslib/hboslib.hbx similarity index 100% rename from harbour/contrib/hboslib/hboslib.hbx rename to contrib/hboslib/hboslib.hbx diff --git a/harbour/contrib/hbpgsql/hbpgsql.h b/contrib/hbpgsql/hbpgsql.h similarity index 100% rename from harbour/contrib/hbpgsql/hbpgsql.h rename to contrib/hbpgsql/hbpgsql.h diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbc b/contrib/hbpgsql/hbpgsql.hbc similarity index 100% rename from harbour/contrib/hbpgsql/hbpgsql.hbc rename to contrib/hbpgsql/hbpgsql.hbc diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbp b/contrib/hbpgsql/hbpgsql.hbp similarity index 100% rename from harbour/contrib/hbpgsql/hbpgsql.hbp rename to contrib/hbpgsql/hbpgsql.hbp diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbx b/contrib/hbpgsql/hbpgsql.hbx similarity index 100% rename from harbour/contrib/hbpgsql/hbpgsql.hbx rename to contrib/hbpgsql/hbpgsql.hbx diff --git a/harbour/contrib/hbpgsql/postgres.c b/contrib/hbpgsql/postgres.c similarity index 100% rename from harbour/contrib/hbpgsql/postgres.c rename to contrib/hbpgsql/postgres.c diff --git a/harbour/contrib/hbpgsql/postgres.ch b/contrib/hbpgsql/postgres.ch similarity index 100% rename from harbour/contrib/hbpgsql/postgres.ch rename to contrib/hbpgsql/postgres.ch diff --git a/harbour/contrib/hbpgsql/rddcopy.c b/contrib/hbpgsql/rddcopy.c similarity index 100% rename from harbour/contrib/hbpgsql/rddcopy.c rename to contrib/hbpgsql/rddcopy.c diff --git a/harbour/contrib/hbpgsql/tests/async.prg b/contrib/hbpgsql/tests/async.prg similarity index 100% rename from harbour/contrib/hbpgsql/tests/async.prg rename to contrib/hbpgsql/tests/async.prg diff --git a/harbour/contrib/hbpgsql/tests/cache.prg b/contrib/hbpgsql/tests/cache.prg similarity index 100% rename from harbour/contrib/hbpgsql/tests/cache.prg rename to contrib/hbpgsql/tests/cache.prg diff --git a/harbour/contrib/hbpgsql/tests/dbf2pg.prg b/contrib/hbpgsql/tests/dbf2pg.prg similarity index 100% rename from harbour/contrib/hbpgsql/tests/dbf2pg.prg rename to contrib/hbpgsql/tests/dbf2pg.prg diff --git a/harbour/contrib/hbpgsql/tests/hbmk.hbm b/contrib/hbpgsql/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbpgsql/tests/hbmk.hbm rename to contrib/hbpgsql/tests/hbmk.hbm diff --git a/harbour/contrib/hbpgsql/tests/simple.prg b/contrib/hbpgsql/tests/simple.prg similarity index 100% rename from harbour/contrib/hbpgsql/tests/simple.prg rename to contrib/hbpgsql/tests/simple.prg diff --git a/harbour/contrib/hbpgsql/tests/stress.prg b/contrib/hbpgsql/tests/stress.prg similarity index 100% rename from harbour/contrib/hbpgsql/tests/stress.prg rename to contrib/hbpgsql/tests/stress.prg diff --git a/harbour/contrib/hbpgsql/tests/test.prg b/contrib/hbpgsql/tests/test.prg similarity index 100% rename from harbour/contrib/hbpgsql/tests/test.prg rename to contrib/hbpgsql/tests/test.prg diff --git a/harbour/contrib/hbpgsql/tpostgre.prg b/contrib/hbpgsql/tpostgre.prg similarity index 100% rename from harbour/contrib/hbpgsql/tpostgre.prg rename to contrib/hbpgsql/tpostgre.prg diff --git a/harbour/contrib/hbplist b/contrib/hbplist similarity index 100% rename from harbour/contrib/hbplist rename to contrib/hbplist diff --git a/harbour/contrib/hbpost.hbm b/contrib/hbpost.hbm similarity index 100% rename from harbour/contrib/hbpost.hbm rename to contrib/hbpost.hbm diff --git a/harbour/contrib/hbpre.hbm b/contrib/hbpre.hbm similarity index 100% rename from harbour/contrib/hbpre.hbm rename to contrib/hbpre.hbm diff --git a/harbour/contrib/hbrun/hbrun.hbp b/contrib/hbrun/hbrun.hbp similarity index 100% rename from harbour/contrib/hbrun/hbrun.hbp rename to contrib/hbrun/hbrun.hbp diff --git a/harbour/contrib/hbsms/hbsms.hbc b/contrib/hbsms/hbsms.hbc similarity index 100% rename from harbour/contrib/hbsms/hbsms.hbc rename to contrib/hbsms/hbsms.hbc diff --git a/harbour/contrib/hbsms/hbsms.hbp b/contrib/hbsms/hbsms.hbp similarity index 100% rename from harbour/contrib/hbsms/hbsms.hbp rename to contrib/hbsms/hbsms.hbp diff --git a/harbour/contrib/hbsms/hbsms.hbx b/contrib/hbsms/hbsms.hbx similarity index 100% rename from harbour/contrib/hbsms/hbsms.hbx rename to contrib/hbsms/hbsms.hbx diff --git a/harbour/contrib/hbsms/sms.prg b/contrib/hbsms/sms.prg similarity index 100% rename from harbour/contrib/hbsms/sms.prg rename to contrib/hbsms/sms.prg diff --git a/harbour/contrib/hbsms/tests/hbmk.hbm b/contrib/hbsms/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbsms/tests/hbmk.hbm rename to contrib/hbsms/tests/hbmk.hbm diff --git a/harbour/contrib/hbsms/tests/send.prg b/contrib/hbsms/tests/send.prg similarity index 100% rename from harbour/contrib/hbsms/tests/send.prg rename to contrib/hbsms/tests/send.prg diff --git a/harbour/contrib/hbsqlit3/core.c b/contrib/hbsqlit3/core.c similarity index 100% rename from harbour/contrib/hbsqlit3/core.c rename to contrib/hbsqlit3/core.c diff --git a/harbour/contrib/hbsqlit3/errstr.prg b/contrib/hbsqlit3/errstr.prg similarity index 100% rename from harbour/contrib/hbsqlit3/errstr.prg rename to contrib/hbsqlit3/errstr.prg diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.ch b/contrib/hbsqlit3/hbsqlit3.ch similarity index 100% rename from harbour/contrib/hbsqlit3/hbsqlit3.ch rename to contrib/hbsqlit3/hbsqlit3.ch diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbc b/contrib/hbsqlit3/hbsqlit3.hbc similarity index 100% rename from harbour/contrib/hbsqlit3/hbsqlit3.hbc rename to contrib/hbsqlit3/hbsqlit3.hbc diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbp b/contrib/hbsqlit3/hbsqlit3.hbp similarity index 100% rename from harbour/contrib/hbsqlit3/hbsqlit3.hbp rename to contrib/hbsqlit3/hbsqlit3.hbp diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbx b/contrib/hbsqlit3/hbsqlit3.hbx similarity index 100% rename from harbour/contrib/hbsqlit3/hbsqlit3.hbx rename to contrib/hbsqlit3/hbsqlit3.hbx diff --git a/harbour/contrib/hbsqlit3/hdbc.prg b/contrib/hbsqlit3/hdbc.prg similarity index 100% rename from harbour/contrib/hbsqlit3/hdbc.prg rename to contrib/hbsqlit3/hdbc.prg diff --git a/harbour/contrib/hbsqlit3/tests/authoriz.prg b/contrib/hbsqlit3/tests/authoriz.prg similarity index 100% rename from harbour/contrib/hbsqlit3/tests/authoriz.prg rename to contrib/hbsqlit3/tests/authoriz.prg diff --git a/harbour/contrib/hbsqlit3/tests/backup.prg b/contrib/hbsqlit3/tests/backup.prg similarity index 100% rename from harbour/contrib/hbsqlit3/tests/backup.prg rename to contrib/hbsqlit3/tests/backup.prg diff --git a/harbour/contrib/hbsqlit3/tests/blob.prg b/contrib/hbsqlit3/tests/blob.prg similarity index 100% rename from harbour/contrib/hbsqlit3/tests/blob.prg rename to contrib/hbsqlit3/tests/blob.prg diff --git a/harbour/contrib/hbsqlit3/tests/demo.prg b/contrib/hbsqlit3/tests/demo.prg similarity index 100% rename from harbour/contrib/hbsqlit3/tests/demo.prg rename to contrib/hbsqlit3/tests/demo.prg diff --git a/harbour/contrib/hbsqlit3/tests/hbmk.hbm b/contrib/hbsqlit3/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbsqlit3/tests/hbmk.hbm rename to contrib/hbsqlit3/tests/hbmk.hbm diff --git a/harbour/contrib/hbsqlit3/tests/hdbc.prg b/contrib/hbsqlit3/tests/hdbc.prg similarity index 100% rename from harbour/contrib/hbsqlit3/tests/hdbc.prg rename to contrib/hbsqlit3/tests/hdbc.prg diff --git a/harbour/contrib/hbsqlit3/tests/hooks.prg b/contrib/hbsqlit3/tests/hooks.prg similarity index 100% rename from harbour/contrib/hbsqlit3/tests/hooks.prg rename to contrib/hbsqlit3/tests/hooks.prg diff --git a/harbour/contrib/hbsqlit3/tests/metadata.prg b/contrib/hbsqlit3/tests/metadata.prg similarity index 100% rename from harbour/contrib/hbsqlit3/tests/metadata.prg rename to contrib/hbsqlit3/tests/metadata.prg diff --git a/harbour/contrib/hbsqlit3/tests/pack.prg b/contrib/hbsqlit3/tests/pack.prg similarity index 100% rename from harbour/contrib/hbsqlit3/tests/pack.prg rename to contrib/hbsqlit3/tests/pack.prg diff --git a/harbour/contrib/hbsqlit3/tests/pngtest.png b/contrib/hbsqlit3/tests/pngtest.png similarity index 100% rename from harbour/contrib/hbsqlit3/tests/pngtest.png rename to contrib/hbsqlit3/tests/pngtest.png diff --git a/harbour/contrib/hbssl/bio.c b/contrib/hbssl/bio.c similarity index 100% rename from harbour/contrib/hbssl/bio.c rename to contrib/hbssl/bio.c diff --git a/harbour/contrib/hbssl/err.c b/contrib/hbssl/err.c similarity index 100% rename from harbour/contrib/hbssl/err.c rename to contrib/hbssl/err.c diff --git a/harbour/contrib/hbssl/evp.c b/contrib/hbssl/evp.c similarity index 100% rename from harbour/contrib/hbssl/evp.c rename to contrib/hbssl/evp.c diff --git a/harbour/contrib/hbssl/evpciph.c b/contrib/hbssl/evpciph.c similarity index 100% rename from harbour/contrib/hbssl/evpciph.c rename to contrib/hbssl/evpciph.c diff --git a/harbour/contrib/hbssl/evpenc.c b/contrib/hbssl/evpenc.c similarity index 100% rename from harbour/contrib/hbssl/evpenc.c rename to contrib/hbssl/evpenc.c diff --git a/harbour/contrib/hbssl/evpmd.c b/contrib/hbssl/evpmd.c similarity index 100% rename from harbour/contrib/hbssl/evpmd.c rename to contrib/hbssl/evpmd.c diff --git a/harbour/contrib/hbssl/evppkey.c b/contrib/hbssl/evppkey.c similarity index 100% rename from harbour/contrib/hbssl/evppkey.c rename to contrib/hbssl/evppkey.c diff --git a/harbour/contrib/hbssl/hbssl.ch b/contrib/hbssl/hbssl.ch similarity index 100% rename from harbour/contrib/hbssl/hbssl.ch rename to contrib/hbssl/hbssl.ch diff --git a/harbour/contrib/hbssl/hbssl.h b/contrib/hbssl/hbssl.h similarity index 100% rename from harbour/contrib/hbssl/hbssl.h rename to contrib/hbssl/hbssl.h diff --git a/harbour/contrib/hbssl/hbssl.hbc b/contrib/hbssl/hbssl.hbc similarity index 100% rename from harbour/contrib/hbssl/hbssl.hbc rename to contrib/hbssl/hbssl.hbc diff --git a/harbour/contrib/hbssl/hbssl.hbm b/contrib/hbssl/hbssl.hbm similarity index 100% rename from harbour/contrib/hbssl/hbssl.hbm rename to contrib/hbssl/hbssl.hbm diff --git a/harbour/contrib/hbssl/hbssl.hbp b/contrib/hbssl/hbssl.hbp similarity index 100% rename from harbour/contrib/hbssl/hbssl.hbp rename to contrib/hbssl/hbssl.hbp diff --git a/harbour/contrib/hbssl/hbssl.hbx b/contrib/hbssl/hbssl.hbx similarity index 100% rename from harbour/contrib/hbssl/hbssl.hbx rename to contrib/hbssl/hbssl.hbx diff --git a/harbour/contrib/hbssl/hbssls.hbp b/contrib/hbssl/hbssls.hbp similarity index 100% rename from harbour/contrib/hbssl/hbssls.hbp rename to contrib/hbssl/hbssls.hbp diff --git a/harbour/contrib/hbssl/pem.c b/contrib/hbssl/pem.c similarity index 100% rename from harbour/contrib/hbssl/pem.c rename to contrib/hbssl/pem.c diff --git a/harbour/contrib/hbssl/rand.c b/contrib/hbssl/rand.c similarity index 100% rename from harbour/contrib/hbssl/rand.c rename to contrib/hbssl/rand.c diff --git a/harbour/contrib/hbssl/ssl.c b/contrib/hbssl/ssl.c similarity index 100% rename from harbour/contrib/hbssl/ssl.c rename to contrib/hbssl/ssl.c diff --git a/harbour/contrib/hbssl/ssl_hb.c b/contrib/hbssl/ssl_hb.c similarity index 100% rename from harbour/contrib/hbssl/ssl_hb.c rename to contrib/hbssl/ssl_hb.c diff --git a/harbour/contrib/hbssl/sslciph.c b/contrib/hbssl/sslciph.c similarity index 100% rename from harbour/contrib/hbssl/sslciph.c rename to contrib/hbssl/sslciph.c diff --git a/harbour/contrib/hbssl/sslctx.c b/contrib/hbssl/sslctx.c similarity index 100% rename from harbour/contrib/hbssl/sslctx.c rename to contrib/hbssl/sslctx.c diff --git a/harbour/contrib/hbssl/sslsess.c b/contrib/hbssl/sslsess.c similarity index 100% rename from harbour/contrib/hbssl/sslsess.c rename to contrib/hbssl/sslsess.c diff --git a/harbour/contrib/hbssl/tests/bio.prg b/contrib/hbssl/tests/bio.prg similarity index 100% rename from harbour/contrib/hbssl/tests/bio.prg rename to contrib/hbssl/tests/bio.prg diff --git a/harbour/contrib/hbssl/tests/crypt.prg b/contrib/hbssl/tests/crypt.prg similarity index 100% rename from harbour/contrib/hbssl/tests/crypt.prg rename to contrib/hbssl/tests/crypt.prg diff --git a/harbour/contrib/hbssl/tests/digest.prg b/contrib/hbssl/tests/digest.prg similarity index 100% rename from harbour/contrib/hbssl/tests/digest.prg rename to contrib/hbssl/tests/digest.prg diff --git a/harbour/contrib/hbssl/tests/encode.prg b/contrib/hbssl/tests/encode.prg similarity index 100% rename from harbour/contrib/hbssl/tests/encode.prg rename to contrib/hbssl/tests/encode.prg diff --git a/harbour/contrib/hbssl/tests/hbmk.hbm b/contrib/hbssl/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbssl/tests/hbmk.hbm rename to contrib/hbssl/tests/hbmk.hbm diff --git a/harbour/contrib/hbssl/tests/pem.prg b/contrib/hbssl/tests/pem.prg similarity index 100% rename from harbour/contrib/hbssl/tests/pem.prg rename to contrib/hbssl/tests/pem.prg diff --git a/harbour/contrib/hbssl/tests/privkey.pem b/contrib/hbssl/tests/privkey.pem similarity index 100% rename from harbour/contrib/hbssl/tests/privkey.pem rename to contrib/hbssl/tests/privkey.pem diff --git a/harbour/contrib/hbssl/tests/pubkey.pem b/contrib/hbssl/tests/pubkey.pem similarity index 100% rename from harbour/contrib/hbssl/tests/pubkey.pem rename to contrib/hbssl/tests/pubkey.pem diff --git a/harbour/contrib/hbssl/tests/test.prg b/contrib/hbssl/tests/test.prg similarity index 100% rename from harbour/contrib/hbssl/tests/test.prg rename to contrib/hbssl/tests/test.prg diff --git a/harbour/contrib/hbssl/x509.c b/contrib/hbssl/x509.c similarity index 100% rename from harbour/contrib/hbssl/x509.c rename to contrib/hbssl/x509.c diff --git a/harbour/contrib/hbtest/core.prg b/contrib/hbtest/core.prg similarity index 100% rename from harbour/contrib/hbtest/core.prg rename to contrib/hbtest/core.prg diff --git a/harbour/contrib/hbtest/hbtest.ch b/contrib/hbtest/hbtest.ch similarity index 100% rename from harbour/contrib/hbtest/hbtest.ch rename to contrib/hbtest/hbtest.ch diff --git a/harbour/contrib/hbtest/hbtest.hbc b/contrib/hbtest/hbtest.hbc similarity index 100% rename from harbour/contrib/hbtest/hbtest.hbc rename to contrib/hbtest/hbtest.hbc diff --git a/harbour/contrib/hbtest/hbtest.hbp b/contrib/hbtest/hbtest.hbp similarity index 100% rename from harbour/contrib/hbtest/hbtest.hbp rename to contrib/hbtest/hbtest.hbp diff --git a/harbour/contrib/hbtest/hbtest.hbx b/contrib/hbtest/hbtest.hbx similarity index 100% rename from harbour/contrib/hbtest/hbtest.hbx rename to contrib/hbtest/hbtest.hbx diff --git a/harbour/contrib/hbtest/tests/hbmk.hbm b/contrib/hbtest/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbtest/tests/hbmk.hbm rename to contrib/hbtest/tests/hbmk.hbm diff --git a/harbour/contrib/hbtest/tests/test.prg b/contrib/hbtest/tests/test.prg similarity index 100% rename from harbour/contrib/hbtest/tests/test.prg rename to contrib/hbtest/tests/test.prg diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/LICENSE.txt b/contrib/hbtinymt/3rd/tinymt/LICENSE.txt similarity index 100% rename from harbour/contrib/hbtinymt/3rd/tinymt/LICENSE.txt rename to contrib/hbtinymt/3rd/tinymt/LICENSE.txt diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.dif b/contrib/hbtinymt/3rd/tinymt/tinymt.dif similarity index 100% rename from harbour/contrib/hbtinymt/3rd/tinymt/tinymt.dif rename to contrib/hbtinymt/3rd/tinymt/tinymt.dif diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbc b/contrib/hbtinymt/3rd/tinymt/tinymt.hbc similarity index 100% rename from harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbc rename to contrib/hbtinymt/3rd/tinymt/tinymt.hbc diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbp b/contrib/hbtinymt/3rd/tinymt/tinymt.hbp similarity index 100% rename from harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbp rename to contrib/hbtinymt/3rd/tinymt/tinymt.hbp diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt32.c b/contrib/hbtinymt/3rd/tinymt/tinymt32.c similarity index 100% rename from harbour/contrib/hbtinymt/3rd/tinymt/tinymt32.c rename to contrib/hbtinymt/3rd/tinymt/tinymt32.c diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt32.h b/contrib/hbtinymt/3rd/tinymt/tinymt32.h similarity index 100% rename from harbour/contrib/hbtinymt/3rd/tinymt/tinymt32.h rename to contrib/hbtinymt/3rd/tinymt/tinymt32.h diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt64.c b/contrib/hbtinymt/3rd/tinymt/tinymt64.c similarity index 100% rename from harbour/contrib/hbtinymt/3rd/tinymt/tinymt64.c rename to contrib/hbtinymt/3rd/tinymt/tinymt64.c diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt64.h b/contrib/hbtinymt/3rd/tinymt/tinymt64.h similarity index 100% rename from harbour/contrib/hbtinymt/3rd/tinymt/tinymt64.h rename to contrib/hbtinymt/3rd/tinymt/tinymt64.h diff --git a/harbour/contrib/hbtinymt/core32.c b/contrib/hbtinymt/core32.c similarity index 100% rename from harbour/contrib/hbtinymt/core32.c rename to contrib/hbtinymt/core32.c diff --git a/harbour/contrib/hbtinymt/core64.c b/contrib/hbtinymt/core64.c similarity index 100% rename from harbour/contrib/hbtinymt/core64.c rename to contrib/hbtinymt/core64.c diff --git a/harbour/contrib/hbtinymt/hbtinymt.hbc b/contrib/hbtinymt/hbtinymt.hbc similarity index 100% rename from harbour/contrib/hbtinymt/hbtinymt.hbc rename to contrib/hbtinymt/hbtinymt.hbc diff --git a/harbour/contrib/hbtinymt/hbtinymt.hbp b/contrib/hbtinymt/hbtinymt.hbp similarity index 100% rename from harbour/contrib/hbtinymt/hbtinymt.hbp rename to contrib/hbtinymt/hbtinymt.hbp diff --git a/harbour/contrib/hbtinymt/hbtinymt.hbx b/contrib/hbtinymt/hbtinymt.hbx similarity index 100% rename from harbour/contrib/hbtinymt/hbtinymt.hbx rename to contrib/hbtinymt/hbtinymt.hbx diff --git a/harbour/contrib/hbtinymt/tests/hbmk.hbm b/contrib/hbtinymt/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbtinymt/tests/hbmk.hbm rename to contrib/hbtinymt/tests/hbmk.hbm diff --git a/harbour/contrib/hbtinymt/tests/test32.prg b/contrib/hbtinymt/tests/test32.prg similarity index 100% rename from harbour/contrib/hbtinymt/tests/test32.prg rename to contrib/hbtinymt/tests/test32.prg diff --git a/harbour/contrib/hbtinymt/tests/test64.prg b/contrib/hbtinymt/tests/test64.prg similarity index 100% rename from harbour/contrib/hbtinymt/tests/test64.prg rename to contrib/hbtinymt/tests/test64.prg diff --git a/harbour/contrib/hbtip/cgi.prg b/contrib/hbtip/cgi.prg similarity index 100% rename from harbour/contrib/hbtip/cgi.prg rename to contrib/hbtip/cgi.prg diff --git a/harbour/contrib/hbtip/client.prg b/contrib/hbtip/client.prg similarity index 100% rename from harbour/contrib/hbtip/client.prg rename to contrib/hbtip/client.prg diff --git a/harbour/contrib/hbtip/credent.prg b/contrib/hbtip/credent.prg similarity index 100% rename from harbour/contrib/hbtip/credent.prg rename to contrib/hbtip/credent.prg diff --git a/harbour/contrib/hbtip/encb64.prg b/contrib/hbtip/encb64.prg similarity index 100% rename from harbour/contrib/hbtip/encb64.prg rename to contrib/hbtip/encb64.prg diff --git a/harbour/contrib/hbtip/encoder.prg b/contrib/hbtip/encoder.prg similarity index 100% rename from harbour/contrib/hbtip/encoder.prg rename to contrib/hbtip/encoder.prg diff --git a/harbour/contrib/hbtip/encqp.prg b/contrib/hbtip/encqp.prg similarity index 100% rename from harbour/contrib/hbtip/encqp.prg rename to contrib/hbtip/encqp.prg diff --git a/harbour/contrib/hbtip/encurl.prg b/contrib/hbtip/encurl.prg similarity index 100% rename from harbour/contrib/hbtip/encurl.prg rename to contrib/hbtip/encurl.prg diff --git a/harbour/contrib/hbtip/encurlc.c b/contrib/hbtip/encurlc.c similarity index 100% rename from harbour/contrib/hbtip/encurlc.c rename to contrib/hbtip/encurlc.c diff --git a/harbour/contrib/hbtip/ftpcli.prg b/contrib/hbtip/ftpcli.prg similarity index 100% rename from harbour/contrib/hbtip/ftpcli.prg rename to contrib/hbtip/ftpcli.prg diff --git a/harbour/contrib/hbtip/hbtip.hbc b/contrib/hbtip/hbtip.hbc similarity index 100% rename from harbour/contrib/hbtip/hbtip.hbc rename to contrib/hbtip/hbtip.hbc diff --git a/harbour/contrib/hbtip/hbtip.hbp b/contrib/hbtip/hbtip.hbp similarity index 100% rename from harbour/contrib/hbtip/hbtip.hbp rename to contrib/hbtip/hbtip.hbp diff --git a/harbour/contrib/hbtip/hbtip.hbx b/contrib/hbtip/hbtip.hbx similarity index 100% rename from harbour/contrib/hbtip/hbtip.hbx rename to contrib/hbtip/hbtip.hbx diff --git a/harbour/contrib/hbtip/httpcli.prg b/contrib/hbtip/httpcli.prg similarity index 100% rename from harbour/contrib/hbtip/httpcli.prg rename to contrib/hbtip/httpcli.prg diff --git a/harbour/contrib/hbtip/log.prg b/contrib/hbtip/log.prg similarity index 100% rename from harbour/contrib/hbtip/log.prg rename to contrib/hbtip/log.prg diff --git a/harbour/contrib/hbtip/mail.prg b/contrib/hbtip/mail.prg similarity index 100% rename from harbour/contrib/hbtip/mail.prg rename to contrib/hbtip/mail.prg diff --git a/harbour/contrib/hbtip/popcli.prg b/contrib/hbtip/popcli.prg similarity index 100% rename from harbour/contrib/hbtip/popcli.prg rename to contrib/hbtip/popcli.prg diff --git a/harbour/contrib/hbtip/sendmail.prg b/contrib/hbtip/sendmail.prg similarity index 100% rename from harbour/contrib/hbtip/sendmail.prg rename to contrib/hbtip/sendmail.prg diff --git a/harbour/contrib/hbtip/sessid.prg b/contrib/hbtip/sessid.prg similarity index 100% rename from harbour/contrib/hbtip/sessid.prg rename to contrib/hbtip/sessid.prg diff --git a/harbour/contrib/hbtip/smtpcli.prg b/contrib/hbtip/smtpcli.prg similarity index 100% rename from harbour/contrib/hbtip/smtpcli.prg rename to contrib/hbtip/smtpcli.prg diff --git a/harbour/contrib/hbtip/tests/base64.prg b/contrib/hbtip/tests/base64.prg similarity index 100% rename from harbour/contrib/hbtip/tests/base64.prg rename to contrib/hbtip/tests/base64.prg diff --git a/harbour/contrib/hbtip/tests/dbtohtml.prg b/contrib/hbtip/tests/dbtohtml.prg similarity index 100% rename from harbour/contrib/hbtip/tests/dbtohtml.prg rename to contrib/hbtip/tests/dbtohtml.prg diff --git a/harbour/contrib/hbtip/tests/dnldftp.prg b/contrib/hbtip/tests/dnldftp.prg similarity index 100% rename from harbour/contrib/hbtip/tests/dnldftp.prg rename to contrib/hbtip/tests/dnldftp.prg diff --git a/harbour/contrib/hbtip/tests/ftpadv.prg b/contrib/hbtip/tests/ftpadv.prg similarity index 100% rename from harbour/contrib/hbtip/tests/ftpadv.prg rename to contrib/hbtip/tests/ftpadv.prg diff --git a/harbour/contrib/hbtip/tests/gmail.hbp b/contrib/hbtip/tests/gmail.hbp similarity index 100% rename from harbour/contrib/hbtip/tests/gmail.hbp rename to contrib/hbtip/tests/gmail.hbp diff --git a/harbour/contrib/hbtip/tests/gmail.prg b/contrib/hbtip/tests/gmail.prg similarity index 100% rename from harbour/contrib/hbtip/tests/gmail.prg rename to contrib/hbtip/tests/gmail.prg diff --git a/harbour/contrib/hbtip/tests/hbmk.hbm b/contrib/hbtip/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbtip/tests/hbmk.hbm rename to contrib/hbtip/tests/hbmk.hbm diff --git a/harbour/contrib/hbtip/tests/httpadv.prg b/contrib/hbtip/tests/httpadv.prg similarity index 100% rename from harbour/contrib/hbtip/tests/httpadv.prg rename to contrib/hbtip/tests/httpadv.prg diff --git a/harbour/contrib/hbtip/tests/httpcli.prg b/contrib/hbtip/tests/httpcli.prg similarity index 100% rename from harbour/contrib/hbtip/tests/httpcli.prg rename to contrib/hbtip/tests/httpcli.prg diff --git a/harbour/contrib/hbtip/tests/loadhtml.prg b/contrib/hbtip/tests/loadhtml.prg similarity index 100% rename from harbour/contrib/hbtip/tests/loadhtml.prg rename to contrib/hbtip/tests/loadhtml.prg diff --git a/harbour/contrib/hbtip/tests/mimetype.prg b/contrib/hbtip/tests/mimetype.prg similarity index 100% rename from harbour/contrib/hbtip/tests/mimetype.prg rename to contrib/hbtip/tests/mimetype.prg diff --git a/harbour/contrib/hbtip/tests/timestmp.prg b/contrib/hbtip/tests/timestmp.prg similarity index 100% rename from harbour/contrib/hbtip/tests/timestmp.prg rename to contrib/hbtip/tests/timestmp.prg diff --git a/harbour/contrib/hbtip/tests/tipmail.prg b/contrib/hbtip/tests/tipmail.prg similarity index 100% rename from harbour/contrib/hbtip/tests/tipmail.prg rename to contrib/hbtip/tests/tipmail.prg diff --git a/harbour/contrib/hbtip/tests/tipmmail.prg b/contrib/hbtip/tests/tipmmail.prg similarity index 100% rename from harbour/contrib/hbtip/tests/tipmmail.prg rename to contrib/hbtip/tests/tipmmail.prg diff --git a/harbour/contrib/hbtip/tests/tipwget.prg b/contrib/hbtip/tests/tipwget.prg similarity index 100% rename from harbour/contrib/hbtip/tests/tipwget.prg rename to contrib/hbtip/tests/tipwget.prg diff --git a/harbour/contrib/hbtip/tests/upld_ftp.prg b/contrib/hbtip/tests/upld_ftp.prg similarity index 100% rename from harbour/contrib/hbtip/tests/upld_ftp.prg rename to contrib/hbtip/tests/upld_ftp.prg diff --git a/harbour/contrib/hbtip/thtml.ch b/contrib/hbtip/thtml.ch similarity index 100% rename from harbour/contrib/hbtip/thtml.ch rename to contrib/hbtip/thtml.ch diff --git a/harbour/contrib/hbtip/thtml.prg b/contrib/hbtip/thtml.prg similarity index 100% rename from harbour/contrib/hbtip/thtml.prg rename to contrib/hbtip/thtml.prg diff --git a/harbour/contrib/hbtip/tip.ch b/contrib/hbtip/tip.ch similarity index 100% rename from harbour/contrib/hbtip/tip.ch rename to contrib/hbtip/tip.ch diff --git a/harbour/contrib/hbtip/url.prg b/contrib/hbtip/url.prg similarity index 100% rename from harbour/contrib/hbtip/url.prg rename to contrib/hbtip/url.prg diff --git a/harbour/contrib/hbtip/utils.c b/contrib/hbtip/utils.c similarity index 100% rename from harbour/contrib/hbtip/utils.c rename to contrib/hbtip/utils.c diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbc b/contrib/hbtpathy/hbtpathy.hbc similarity index 100% rename from harbour/contrib/hbtpathy/hbtpathy.hbc rename to contrib/hbtpathy/hbtpathy.hbc diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbp b/contrib/hbtpathy/hbtpathy.hbp similarity index 100% rename from harbour/contrib/hbtpathy/hbtpathy.hbp rename to contrib/hbtpathy/hbtpathy.hbp diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbx b/contrib/hbtpathy/hbtpathy.hbx similarity index 100% rename from harbour/contrib/hbtpathy/hbtpathy.hbx rename to contrib/hbtpathy/hbtpathy.hbx diff --git a/harbour/contrib/hbtpathy/readme.txt b/contrib/hbtpathy/readme.txt similarity index 100% rename from harbour/contrib/hbtpathy/readme.txt rename to contrib/hbtpathy/readme.txt diff --git a/harbour/contrib/hbtpathy/telepath.ch b/contrib/hbtpathy/telepath.ch similarity index 100% rename from harbour/contrib/hbtpathy/telepath.ch rename to contrib/hbtpathy/telepath.ch diff --git a/harbour/contrib/hbtpathy/telepath.prg b/contrib/hbtpathy/telepath.prg similarity index 100% rename from harbour/contrib/hbtpathy/telepath.prg rename to contrib/hbtpathy/telepath.prg diff --git a/harbour/contrib/hbtpathy/tests/hbmk.hbm b/contrib/hbtpathy/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbtpathy/tests/hbmk.hbm rename to contrib/hbtpathy/tests/hbmk.hbm diff --git a/harbour/contrib/hbtpathy/tests/test.prg b/contrib/hbtpathy/tests/test.prg similarity index 100% rename from harbour/contrib/hbtpathy/tests/test.prg rename to contrib/hbtpathy/tests/test.prg diff --git a/harbour/contrib/hbtpathy/tp_idle.prg b/contrib/hbtpathy/tp_idle.prg similarity index 100% rename from harbour/contrib/hbtpathy/tp_idle.prg rename to contrib/hbtpathy/tp_idle.prg diff --git a/harbour/contrib/hbunix/chdir.c b/contrib/hbunix/chdir.c similarity index 100% rename from harbour/contrib/hbunix/chdir.c rename to contrib/hbunix/chdir.c diff --git a/harbour/contrib/hbunix/chroot.c b/contrib/hbunix/chroot.c similarity index 100% rename from harbour/contrib/hbunix/chroot.c rename to contrib/hbunix/chroot.c diff --git a/harbour/contrib/hbunix/daemon.c b/contrib/hbunix/daemon.c similarity index 100% rename from harbour/contrib/hbunix/daemon.c rename to contrib/hbunix/daemon.c diff --git a/harbour/contrib/hbunix/hbposix.h b/contrib/hbunix/hbposix.h similarity index 100% rename from harbour/contrib/hbunix/hbposix.h rename to contrib/hbunix/hbposix.h diff --git a/harbour/contrib/hbunix/hbunix.hbc b/contrib/hbunix/hbunix.hbc similarity index 100% rename from harbour/contrib/hbunix/hbunix.hbc rename to contrib/hbunix/hbunix.hbc diff --git a/harbour/contrib/hbunix/hbunix.hbp b/contrib/hbunix/hbunix.hbp similarity index 100% rename from harbour/contrib/hbunix/hbunix.hbp rename to contrib/hbunix/hbunix.hbp diff --git a/harbour/contrib/hbunix/hbunix.hbx b/contrib/hbunix/hbunix.hbx similarity index 100% rename from harbour/contrib/hbunix/hbunix.hbx rename to contrib/hbunix/hbunix.hbx diff --git a/harbour/contrib/hbunix/posix.c b/contrib/hbunix/posix.c similarity index 100% rename from harbour/contrib/hbunix/posix.c rename to contrib/hbunix/posix.c diff --git a/harbour/contrib/hbunix/posixerr.c b/contrib/hbunix/posixerr.c similarity index 100% rename from harbour/contrib/hbunix/posixerr.c rename to contrib/hbunix/posixerr.c diff --git a/harbour/contrib/hbunix/sleep.c b/contrib/hbunix/sleep.c similarity index 100% rename from harbour/contrib/hbunix/sleep.c rename to contrib/hbunix/sleep.c diff --git a/harbour/contrib/hbunix/tests/daemon.prg b/contrib/hbunix/tests/daemon.prg similarity index 100% rename from harbour/contrib/hbunix/tests/daemon.prg rename to contrib/hbunix/tests/daemon.prg diff --git a/harbour/contrib/hbunix/tests/getpid.prg b/contrib/hbunix/tests/getpid.prg similarity index 100% rename from harbour/contrib/hbunix/tests/getpid.prg rename to contrib/hbunix/tests/getpid.prg diff --git a/harbour/contrib/hbunix/tests/hbmk.hbm b/contrib/hbunix/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbunix/tests/hbmk.hbm rename to contrib/hbunix/tests/hbmk.hbm diff --git a/harbour/contrib/hbunix/uidgid.c b/contrib/hbunix/uidgid.c similarity index 100% rename from harbour/contrib/hbunix/uidgid.c rename to contrib/hbunix/uidgid.c diff --git a/harbour/contrib/hbwin/axcore.c b/contrib/hbwin/axcore.c similarity index 100% rename from harbour/contrib/hbwin/axcore.c rename to contrib/hbwin/axcore.c diff --git a/harbour/contrib/hbwin/axfunc.prg b/contrib/hbwin/axfunc.prg similarity index 100% rename from harbour/contrib/hbwin/axfunc.prg rename to contrib/hbwin/axfunc.prg diff --git a/harbour/contrib/hbwin/hbole.ch b/contrib/hbwin/hbole.ch similarity index 100% rename from harbour/contrib/hbwin/hbole.ch rename to contrib/hbwin/hbole.ch diff --git a/harbour/contrib/hbwin/hbolesrv-mingw.def b/contrib/hbwin/hbolesrv-mingw.def similarity index 100% rename from harbour/contrib/hbwin/hbolesrv-mingw.def rename to contrib/hbwin/hbolesrv-mingw.def diff --git a/harbour/contrib/hbwin/hbolesrv-watcom.def b/contrib/hbwin/hbolesrv-watcom.def similarity index 100% rename from harbour/contrib/hbwin/hbolesrv-watcom.def rename to contrib/hbwin/hbolesrv-watcom.def diff --git a/harbour/contrib/hbwin/hbolesrv.c b/contrib/hbwin/hbolesrv.c similarity index 100% rename from harbour/contrib/hbwin/hbolesrv.c rename to contrib/hbwin/hbolesrv.c diff --git a/harbour/contrib/hbwin/hbolesrv.def b/contrib/hbwin/hbolesrv.def similarity index 100% rename from harbour/contrib/hbwin/hbolesrv.def rename to contrib/hbwin/hbolesrv.def diff --git a/harbour/contrib/hbwin/hbolesrv.hbc b/contrib/hbwin/hbolesrv.hbc similarity index 100% rename from harbour/contrib/hbwin/hbolesrv.hbc rename to contrib/hbwin/hbolesrv.hbc diff --git a/harbour/contrib/hbwin/hbsim.ch b/contrib/hbwin/hbsim.ch similarity index 100% rename from harbour/contrib/hbwin/hbsim.ch rename to contrib/hbwin/hbsim.ch diff --git a/harbour/contrib/hbwin/hbwapi.h b/contrib/hbwin/hbwapi.h similarity index 100% rename from harbour/contrib/hbwin/hbwapi.h rename to contrib/hbwin/hbwapi.h diff --git a/harbour/contrib/hbwin/hbwin.ch b/contrib/hbwin/hbwin.ch similarity index 100% rename from harbour/contrib/hbwin/hbwin.ch rename to contrib/hbwin/hbwin.ch diff --git a/harbour/contrib/hbwin/hbwin.h b/contrib/hbwin/hbwin.h similarity index 100% rename from harbour/contrib/hbwin/hbwin.h rename to contrib/hbwin/hbwin.h diff --git a/harbour/contrib/hbwin/hbwin.hbc b/contrib/hbwin/hbwin.hbc similarity index 100% rename from harbour/contrib/hbwin/hbwin.hbc rename to contrib/hbwin/hbwin.hbc diff --git a/harbour/contrib/hbwin/hbwin.hbp b/contrib/hbwin/hbwin.hbp similarity index 100% rename from harbour/contrib/hbwin/hbwin.hbp rename to contrib/hbwin/hbwin.hbp diff --git a/harbour/contrib/hbwin/hbwin.hbx b/contrib/hbwin/hbwin.hbx similarity index 100% rename from harbour/contrib/hbwin/hbwin.hbx rename to contrib/hbwin/hbwin.hbx diff --git a/harbour/contrib/hbwin/hbwinole.h b/contrib/hbwin/hbwinole.h similarity index 100% rename from harbour/contrib/hbwin/hbwinole.h rename to contrib/hbwin/hbwinole.h diff --git a/harbour/contrib/hbwin/mapi.c b/contrib/hbwin/mapi.c similarity index 100% rename from harbour/contrib/hbwin/mapi.c rename to contrib/hbwin/mapi.c diff --git a/harbour/contrib/hbwin/oemansi.c b/contrib/hbwin/oemansi.c similarity index 100% rename from harbour/contrib/hbwin/oemansi.c rename to contrib/hbwin/oemansi.c diff --git a/harbour/contrib/hbwin/oleauto.prg b/contrib/hbwin/oleauto.prg similarity index 100% rename from harbour/contrib/hbwin/oleauto.prg rename to contrib/hbwin/oleauto.prg diff --git a/harbour/contrib/hbwin/olecore.c b/contrib/hbwin/olecore.c similarity index 100% rename from harbour/contrib/hbwin/olecore.c rename to contrib/hbwin/olecore.c diff --git a/harbour/contrib/hbwin/oleuuid.c b/contrib/hbwin/oleuuid.c similarity index 100% rename from harbour/contrib/hbwin/oleuuid.c rename to contrib/hbwin/oleuuid.c diff --git a/harbour/contrib/hbwin/tests/activex.prg b/contrib/hbwin/tests/activex.prg similarity index 100% rename from harbour/contrib/hbwin/tests/activex.prg rename to contrib/hbwin/tests/activex.prg diff --git a/harbour/contrib/hbwin/tests/dlg.hbp b/contrib/hbwin/tests/dlg.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/dlg.hbp rename to contrib/hbwin/tests/dlg.hbp diff --git a/harbour/contrib/hbwin/tests/dlg.prg b/contrib/hbwin/tests/dlg.prg similarity index 100% rename from harbour/contrib/hbwin/tests/dlg.prg rename to contrib/hbwin/tests/dlg.prg diff --git a/harbour/contrib/hbwin/tests/dlg.rc b/contrib/hbwin/tests/dlg.rc similarity index 100% rename from harbour/contrib/hbwin/tests/dlg.rc rename to contrib/hbwin/tests/dlg.rc diff --git a/harbour/contrib/hbwin/tests/eventlog.prg b/contrib/hbwin/tests/eventlog.prg similarity index 100% rename from harbour/contrib/hbwin/tests/eventlog.prg rename to contrib/hbwin/tests/eventlog.prg diff --git a/harbour/contrib/hbwin/tests/hbmk.hbm b/contrib/hbwin/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbwin/tests/hbmk.hbm rename to contrib/hbwin/tests/hbmk.hbm diff --git a/harbour/contrib/hbwin/tests/mapimail.prg b/contrib/hbwin/tests/mapimail.prg similarity index 100% rename from harbour/contrib/hbwin/tests/mapimail.prg rename to contrib/hbwin/tests/mapimail.prg diff --git a/harbour/contrib/hbwin/tests/mutexwin.prg b/contrib/hbwin/tests/mutexwin.prg similarity index 100% rename from harbour/contrib/hbwin/tests/mutexwin.prg rename to contrib/hbwin/tests/mutexwin.prg diff --git a/harbour/contrib/hbwin/tests/ole.prg b/contrib/hbwin/tests/ole.prg similarity index 100% rename from harbour/contrib/hbwin/tests/ole.prg rename to contrib/hbwin/tests/ole.prg diff --git a/harbour/contrib/hbwin/tests/olesrv1.hbp b/contrib/hbwin/tests/olesrv1.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/olesrv1.hbp rename to contrib/hbwin/tests/olesrv1.hbp diff --git a/harbour/contrib/hbwin/tests/olesrv1.prg b/contrib/hbwin/tests/olesrv1.prg similarity index 100% rename from harbour/contrib/hbwin/tests/olesrv1.prg rename to contrib/hbwin/tests/olesrv1.prg diff --git a/harbour/contrib/hbwin/tests/olesrv2.hbp b/contrib/hbwin/tests/olesrv2.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/olesrv2.hbp rename to contrib/hbwin/tests/olesrv2.hbp diff --git a/harbour/contrib/hbwin/tests/olesrv2.prg b/contrib/hbwin/tests/olesrv2.prg similarity index 100% rename from harbour/contrib/hbwin/tests/olesrv2.prg rename to contrib/hbwin/tests/olesrv2.prg diff --git a/harbour/contrib/hbwin/tests/olesrv3.hbp b/contrib/hbwin/tests/olesrv3.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/olesrv3.hbp rename to contrib/hbwin/tests/olesrv3.hbp diff --git a/harbour/contrib/hbwin/tests/olesrv3.prg b/contrib/hbwin/tests/olesrv3.prg similarity index 100% rename from harbour/contrib/hbwin/tests/olesrv3.prg rename to contrib/hbwin/tests/olesrv3.prg diff --git a/harbour/contrib/hbwin/tests/olesrv4.hbp b/contrib/hbwin/tests/olesrv4.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/olesrv4.hbp rename to contrib/hbwin/tests/olesrv4.hbp diff --git a/harbour/contrib/hbwin/tests/olesrv4.prg b/contrib/hbwin/tests/olesrv4.prg similarity index 100% rename from harbour/contrib/hbwin/tests/olesrv4.prg rename to contrib/hbwin/tests/olesrv4.prg diff --git a/harbour/contrib/hbwin/tests/oletst1.hbp b/contrib/hbwin/tests/oletst1.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/oletst1.hbp rename to contrib/hbwin/tests/oletst1.hbp diff --git a/harbour/contrib/hbwin/tests/oletst1.prg b/contrib/hbwin/tests/oletst1.prg similarity index 100% rename from harbour/contrib/hbwin/tests/oletst1.prg rename to contrib/hbwin/tests/oletst1.prg diff --git a/harbour/contrib/hbwin/tests/oletst2.hbp b/contrib/hbwin/tests/oletst2.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/oletst2.hbp rename to contrib/hbwin/tests/oletst2.hbp diff --git a/harbour/contrib/hbwin/tests/oletst2.js b/contrib/hbwin/tests/oletst2.js similarity index 100% rename from harbour/contrib/hbwin/tests/oletst2.js rename to contrib/hbwin/tests/oletst2.js diff --git a/harbour/contrib/hbwin/tests/oletst2.prg b/contrib/hbwin/tests/oletst2.prg similarity index 100% rename from harbour/contrib/hbwin/tests/oletst2.prg rename to contrib/hbwin/tests/oletst2.prg diff --git a/harbour/contrib/hbwin/tests/oletst2.vbs b/contrib/hbwin/tests/oletst2.vbs similarity index 100% rename from harbour/contrib/hbwin/tests/oletst2.vbs rename to contrib/hbwin/tests/oletst2.vbs diff --git a/harbour/contrib/hbwin/tests/oletst3.bas b/contrib/hbwin/tests/oletst3.bas similarity index 100% rename from harbour/contrib/hbwin/tests/oletst3.bas rename to contrib/hbwin/tests/oletst3.bas diff --git a/harbour/contrib/hbwin/tests/oletst3.hbp b/contrib/hbwin/tests/oletst3.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/oletst3.hbp rename to contrib/hbwin/tests/oletst3.hbp diff --git a/harbour/contrib/hbwin/tests/oletst3.prg b/contrib/hbwin/tests/oletst3.prg similarity index 100% rename from harbour/contrib/hbwin/tests/oletst3.prg rename to contrib/hbwin/tests/oletst3.prg diff --git a/harbour/contrib/hbwin/tests/oletst4.hbp b/contrib/hbwin/tests/oletst4.hbp similarity index 100% rename from harbour/contrib/hbwin/tests/oletst4.hbp rename to contrib/hbwin/tests/oletst4.hbp diff --git a/harbour/contrib/hbwin/tests/oletst4.prg b/contrib/hbwin/tests/oletst4.prg similarity index 100% rename from harbour/contrib/hbwin/tests/oletst4.prg rename to contrib/hbwin/tests/oletst4.prg diff --git a/harbour/contrib/hbwin/tests/pdfcreat.prg b/contrib/hbwin/tests/pdfcreat.prg similarity index 100% rename from harbour/contrib/hbwin/tests/pdfcreat.prg rename to contrib/hbwin/tests/pdfcreat.prg diff --git a/harbour/contrib/hbwin/tests/prn1.prg b/contrib/hbwin/tests/prn1.prg similarity index 100% rename from harbour/contrib/hbwin/tests/prn1.prg rename to contrib/hbwin/tests/prn1.prg diff --git a/harbour/contrib/hbwin/tests/prn2.prg b/contrib/hbwin/tests/prn2.prg similarity index 100% rename from harbour/contrib/hbwin/tests/prn2.prg rename to contrib/hbwin/tests/prn2.prg diff --git a/harbour/contrib/hbwin/tests/prn3.prg b/contrib/hbwin/tests/prn3.prg similarity index 100% rename from harbour/contrib/hbwin/tests/prn3.prg rename to contrib/hbwin/tests/prn3.prg diff --git a/harbour/contrib/hbwin/tests/prn4.prg b/contrib/hbwin/tests/prn4.prg similarity index 100% rename from harbour/contrib/hbwin/tests/prn4.prg rename to contrib/hbwin/tests/prn4.prg diff --git a/harbour/contrib/hbwin/tests/prngdi.prg b/contrib/hbwin/tests/prngdi.prg similarity index 100% rename from harbour/contrib/hbwin/tests/prngdi.prg rename to contrib/hbwin/tests/prngdi.prg diff --git a/harbour/contrib/hbwin/tests/registry.prg b/contrib/hbwin/tests/registry.prg similarity index 100% rename from harbour/contrib/hbwin/tests/registry.prg rename to contrib/hbwin/tests/registry.prg diff --git a/harbour/contrib/hbwin/tests/sample.odt b/contrib/hbwin/tests/sample.odt similarity index 100% rename from harbour/contrib/hbwin/tests/sample.odt rename to contrib/hbwin/tests/sample.odt diff --git a/harbour/contrib/hbwin/tests/serial1.prg b/contrib/hbwin/tests/serial1.prg similarity index 100% rename from harbour/contrib/hbwin/tests/serial1.prg rename to contrib/hbwin/tests/serial1.prg diff --git a/harbour/contrib/hbwin/tests/serial2.prg b/contrib/hbwin/tests/serial2.prg similarity index 100% rename from harbour/contrib/hbwin/tests/serial2.prg rename to contrib/hbwin/tests/serial2.prg diff --git a/harbour/contrib/hbwin/tests/service.prg b/contrib/hbwin/tests/service.prg similarity index 100% rename from harbour/contrib/hbwin/tests/service.prg rename to contrib/hbwin/tests/service.prg diff --git a/harbour/contrib/hbwin/tests/shfileop.prg b/contrib/hbwin/tests/shfileop.prg similarity index 100% rename from harbour/contrib/hbwin/tests/shfileop.prg rename to contrib/hbwin/tests/shfileop.prg diff --git a/harbour/contrib/hbwin/tests/simwce.prg b/contrib/hbwin/tests/simwce.prg similarity index 100% rename from harbour/contrib/hbwin/tests/simwce.prg rename to contrib/hbwin/tests/simwce.prg diff --git a/harbour/contrib/hbwin/tests/sysdir.prg b/contrib/hbwin/tests/sysdir.prg similarity index 100% rename from harbour/contrib/hbwin/tests/sysdir.prg rename to contrib/hbwin/tests/sysdir.prg diff --git a/harbour/contrib/hbwin/tests/uuid.prg b/contrib/hbwin/tests/uuid.prg similarity index 100% rename from harbour/contrib/hbwin/tests/uuid.prg rename to contrib/hbwin/tests/uuid.prg diff --git a/harbour/contrib/hbwin/wapi_alloc.c b/contrib/hbwin/wapi_alloc.c similarity index 100% rename from harbour/contrib/hbwin/wapi_alloc.c rename to contrib/hbwin/wapi_alloc.c diff --git a/harbour/contrib/hbwin/wapi_commctrl.c b/contrib/hbwin/wapi_commctrl.c similarity index 100% rename from harbour/contrib/hbwin/wapi_commctrl.c rename to contrib/hbwin/wapi_commctrl.c diff --git a/harbour/contrib/hbwin/wapi_err.c b/contrib/hbwin/wapi_err.c similarity index 100% rename from harbour/contrib/hbwin/wapi_err.c rename to contrib/hbwin/wapi_err.c diff --git a/harbour/contrib/hbwin/wapi_misc.c b/contrib/hbwin/wapi_misc.c similarity index 100% rename from harbour/contrib/hbwin/wapi_misc.c rename to contrib/hbwin/wapi_misc.c diff --git a/harbour/contrib/hbwin/wapi_mmsystem.c b/contrib/hbwin/wapi_mmsystem.c similarity index 100% rename from harbour/contrib/hbwin/wapi_mmsystem.c rename to contrib/hbwin/wapi_mmsystem.c diff --git a/harbour/contrib/hbwin/wapi_shellapi.c b/contrib/hbwin/wapi_shellapi.c similarity index 100% rename from harbour/contrib/hbwin/wapi_shellapi.c rename to contrib/hbwin/wapi_shellapi.c diff --git a/harbour/contrib/hbwin/wapi_winbase.c b/contrib/hbwin/wapi_winbase.c similarity index 100% rename from harbour/contrib/hbwin/wapi_winbase.c rename to contrib/hbwin/wapi_winbase.c diff --git a/harbour/contrib/hbwin/wapi_winbase_mutex.c b/contrib/hbwin/wapi_winbase_mutex.c similarity index 100% rename from harbour/contrib/hbwin/wapi_winbase_mutex.c rename to contrib/hbwin/wapi_winbase_mutex.c diff --git a/harbour/contrib/hbwin/wapi_wingdi.c b/contrib/hbwin/wapi_wingdi.c similarity index 100% rename from harbour/contrib/hbwin/wapi_wingdi.c rename to contrib/hbwin/wapi_wingdi.c diff --git a/harbour/contrib/hbwin/wapi_wingdi_font.c b/contrib/hbwin/wapi_wingdi_font.c similarity index 100% rename from harbour/contrib/hbwin/wapi_wingdi_font.c rename to contrib/hbwin/wapi_wingdi_font.c diff --git a/harbour/contrib/hbwin/wapi_winnetwk.c b/contrib/hbwin/wapi_winnetwk.c similarity index 100% rename from harbour/contrib/hbwin/wapi_winnetwk.c rename to contrib/hbwin/wapi_winnetwk.c diff --git a/harbour/contrib/hbwin/wapi_winnls.c b/contrib/hbwin/wapi_winnls.c similarity index 100% rename from harbour/contrib/hbwin/wapi_winnls.c rename to contrib/hbwin/wapi_winnls.c diff --git a/harbour/contrib/hbwin/wapi_winuser.c b/contrib/hbwin/wapi_winuser.c similarity index 100% rename from harbour/contrib/hbwin/wapi_winuser.c rename to contrib/hbwin/wapi_winuser.c diff --git a/harbour/contrib/hbwin/wapi_winuser_dlg.c b/contrib/hbwin/wapi_winuser_dlg.c similarity index 100% rename from harbour/contrib/hbwin/wapi_winuser_dlg.c rename to contrib/hbwin/wapi_winuser_dlg.c diff --git a/harbour/contrib/hbwin/wce_sim.prg b/contrib/hbwin/wce_sim.prg similarity index 100% rename from harbour/contrib/hbwin/wce_sim.prg rename to contrib/hbwin/wce_sim.prg diff --git a/harbour/contrib/hbwin/wce_simc.c b/contrib/hbwin/wce_simc.c similarity index 100% rename from harbour/contrib/hbwin/wce_simc.c rename to contrib/hbwin/wce_simc.c diff --git a/harbour/contrib/hbwin/wce_smsc.c b/contrib/hbwin/wce_smsc.c similarity index 100% rename from harbour/contrib/hbwin/wce_smsc.c rename to contrib/hbwin/wce_smsc.c diff --git a/harbour/contrib/hbwin/win_bmp.c b/contrib/hbwin/win_bmp.c similarity index 100% rename from harbour/contrib/hbwin/win_bmp.c rename to contrib/hbwin/win_bmp.c diff --git a/harbour/contrib/hbwin/win_bmpd.c b/contrib/hbwin/win_bmpd.c similarity index 100% rename from harbour/contrib/hbwin/win_bmpd.c rename to contrib/hbwin/win_bmpd.c diff --git a/harbour/contrib/hbwin/win_com.c b/contrib/hbwin/win_com.c similarity index 100% rename from harbour/contrib/hbwin/win_com.c rename to contrib/hbwin/win_com.c diff --git a/harbour/contrib/hbwin/win_dlg.c b/contrib/hbwin/win_dlg.c similarity index 100% rename from harbour/contrib/hbwin/win_dlg.c rename to contrib/hbwin/win_dlg.c diff --git a/harbour/contrib/hbwin/win_evnt.c b/contrib/hbwin/win_evnt.c similarity index 100% rename from harbour/contrib/hbwin/win_evnt.c rename to contrib/hbwin/win_evnt.c diff --git a/harbour/contrib/hbwin/win_misc.c b/contrib/hbwin/win_misc.c similarity index 100% rename from harbour/contrib/hbwin/win_misc.c rename to contrib/hbwin/win_misc.c diff --git a/harbour/contrib/hbwin/win_os.prg b/contrib/hbwin/win_os.prg similarity index 100% rename from harbour/contrib/hbwin/win_os.prg rename to contrib/hbwin/win_os.prg diff --git a/harbour/contrib/hbwin/win_osc.c b/contrib/hbwin/win_osc.c similarity index 100% rename from harbour/contrib/hbwin/win_osc.c rename to contrib/hbwin/win_osc.c diff --git a/harbour/contrib/hbwin/win_prn1.c b/contrib/hbwin/win_prn1.c similarity index 100% rename from harbour/contrib/hbwin/win_prn1.c rename to contrib/hbwin/win_prn1.c diff --git a/harbour/contrib/hbwin/win_prn2.c b/contrib/hbwin/win_prn2.c similarity index 100% rename from harbour/contrib/hbwin/win_prn2.c rename to contrib/hbwin/win_prn2.c diff --git a/harbour/contrib/hbwin/win_prn3.c b/contrib/hbwin/win_prn3.c similarity index 100% rename from harbour/contrib/hbwin/win_prn3.c rename to contrib/hbwin/win_prn3.c diff --git a/harbour/contrib/hbwin/win_reg.prg b/contrib/hbwin/win_reg.prg similarity index 100% rename from harbour/contrib/hbwin/win_reg.prg rename to contrib/hbwin/win_reg.prg diff --git a/harbour/contrib/hbwin/win_regc.c b/contrib/hbwin/win_regc.c similarity index 100% rename from harbour/contrib/hbwin/win_regc.c rename to contrib/hbwin/win_regc.c diff --git a/harbour/contrib/hbwin/win_rpc.c b/contrib/hbwin/win_rpc.c similarity index 100% rename from harbour/contrib/hbwin/win_rpc.c rename to contrib/hbwin/win_rpc.c diff --git a/harbour/contrib/hbwin/win_shell.c b/contrib/hbwin/win_shell.c similarity index 100% rename from harbour/contrib/hbwin/win_shell.c rename to contrib/hbwin/win_shell.c diff --git a/harbour/contrib/hbwin/win_svc.c b/contrib/hbwin/win_svc.c similarity index 100% rename from harbour/contrib/hbwin/win_svc.c rename to contrib/hbwin/win_svc.c diff --git a/harbour/contrib/hbwin/win_tbmp.prg b/contrib/hbwin/win_tbmp.prg similarity index 100% rename from harbour/contrib/hbwin/win_tbmp.prg rename to contrib/hbwin/win_tbmp.prg diff --git a/harbour/contrib/hbwin/win_tcom.prg b/contrib/hbwin/win_tcom.prg similarity index 100% rename from harbour/contrib/hbwin/win_tcom.prg rename to contrib/hbwin/win_tcom.prg diff --git a/harbour/contrib/hbwin/win_tprn.prg b/contrib/hbwin/win_tprn.prg similarity index 100% rename from harbour/contrib/hbwin/win_tprn.prg rename to contrib/hbwin/win_tprn.prg diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/AUTHORS b/contrib/hbxdiff/3rd/libxdiff/AUTHORS similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/AUTHORS rename to contrib/hbxdiff/3rd/libxdiff/AUTHORS diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/COPYING b/contrib/hbxdiff/3rd/libxdiff/COPYING similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/COPYING rename to contrib/hbxdiff/3rd/libxdiff/COPYING diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/_hbconf.h b/contrib/hbxdiff/3rd/libxdiff/_hbconf.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/_hbconf.h rename to contrib/hbxdiff/3rd/libxdiff/_hbconf.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/libxdiff.dif b/contrib/hbxdiff/3rd/libxdiff/libxdiff.dif similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/libxdiff.dif rename to contrib/hbxdiff/3rd/libxdiff/libxdiff.dif diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/winconfig.h b/contrib/hbxdiff/3rd/libxdiff/winconfig.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/winconfig.h rename to contrib/hbxdiff/3rd/libxdiff/winconfig.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xadler32.c b/contrib/hbxdiff/3rd/libxdiff/xadler32.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xadler32.c rename to contrib/hbxdiff/3rd/libxdiff/xadler32.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xadler32.h b/contrib/hbxdiff/3rd/libxdiff/xadler32.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xadler32.h rename to contrib/hbxdiff/3rd/libxdiff/xadler32.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xalloc.c b/contrib/hbxdiff/3rd/libxdiff/xalloc.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xalloc.c rename to contrib/hbxdiff/3rd/libxdiff/xalloc.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xbdiff.c b/contrib/hbxdiff/3rd/libxdiff/xbdiff.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xbdiff.c rename to contrib/hbxdiff/3rd/libxdiff/xbdiff.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xbdiff.h b/contrib/hbxdiff/3rd/libxdiff/xbdiff.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xbdiff.h rename to contrib/hbxdiff/3rd/libxdiff/xbdiff.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xbpatchi.c b/contrib/hbxdiff/3rd/libxdiff/xbpatchi.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xbpatchi.c rename to contrib/hbxdiff/3rd/libxdiff/xbpatchi.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.h b/contrib/hbxdiff/3rd/libxdiff/xdiff.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.h rename to contrib/hbxdiff/3rd/libxdiff/xdiff.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbc b/contrib/hbxdiff/3rd/libxdiff/xdiff.hbc similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbc rename to contrib/hbxdiff/3rd/libxdiff/xdiff.hbc diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp b/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp rename to contrib/hbxdiff/3rd/libxdiff/xdiff.hbp diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.txt b/contrib/hbxdiff/3rd/libxdiff/xdiff.txt similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.txt rename to contrib/hbxdiff/3rd/libxdiff/xdiff.txt diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiffi.c b/contrib/hbxdiff/3rd/libxdiff/xdiffi.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xdiffi.c rename to contrib/hbxdiff/3rd/libxdiff/xdiffi.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiffi.h b/contrib/hbxdiff/3rd/libxdiff/xdiffi.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xdiffi.h rename to contrib/hbxdiff/3rd/libxdiff/xdiffi.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xemit.c b/contrib/hbxdiff/3rd/libxdiff/xemit.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xemit.c rename to contrib/hbxdiff/3rd/libxdiff/xemit.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xemit.h b/contrib/hbxdiff/3rd/libxdiff/xemit.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xemit.h rename to contrib/hbxdiff/3rd/libxdiff/xemit.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xinclude.h b/contrib/hbxdiff/3rd/libxdiff/xinclude.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xinclude.h rename to contrib/hbxdiff/3rd/libxdiff/xinclude.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xmacros.h b/contrib/hbxdiff/3rd/libxdiff/xmacros.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xmacros.h rename to contrib/hbxdiff/3rd/libxdiff/xmacros.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xmerge3.c b/contrib/hbxdiff/3rd/libxdiff/xmerge3.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xmerge3.c rename to contrib/hbxdiff/3rd/libxdiff/xmerge3.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xmissing.c b/contrib/hbxdiff/3rd/libxdiff/xmissing.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xmissing.c rename to contrib/hbxdiff/3rd/libxdiff/xmissing.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xmissing.h b/contrib/hbxdiff/3rd/libxdiff/xmissing.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xmissing.h rename to contrib/hbxdiff/3rd/libxdiff/xmissing.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xpatchi.c b/contrib/hbxdiff/3rd/libxdiff/xpatchi.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xpatchi.c rename to contrib/hbxdiff/3rd/libxdiff/xpatchi.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xprepare.c b/contrib/hbxdiff/3rd/libxdiff/xprepare.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xprepare.c rename to contrib/hbxdiff/3rd/libxdiff/xprepare.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xprepare.h b/contrib/hbxdiff/3rd/libxdiff/xprepare.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xprepare.h rename to contrib/hbxdiff/3rd/libxdiff/xprepare.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xrabdiff.c b/contrib/hbxdiff/3rd/libxdiff/xrabdiff.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xrabdiff.c rename to contrib/hbxdiff/3rd/libxdiff/xrabdiff.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xrabply.c b/contrib/hbxdiff/3rd/libxdiff/xrabply.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xrabply.c rename to contrib/hbxdiff/3rd/libxdiff/xrabply.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xtypes.h b/contrib/hbxdiff/3rd/libxdiff/xtypes.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xtypes.h rename to contrib/hbxdiff/3rd/libxdiff/xtypes.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xutils.c b/contrib/hbxdiff/3rd/libxdiff/xutils.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xutils.c rename to contrib/hbxdiff/3rd/libxdiff/xutils.c diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xutils.h b/contrib/hbxdiff/3rd/libxdiff/xutils.h similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xutils.h rename to contrib/hbxdiff/3rd/libxdiff/xutils.h diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/xversion.c b/contrib/hbxdiff/3rd/libxdiff/xversion.c similarity index 100% rename from harbour/contrib/hbxdiff/3rd/libxdiff/xversion.c rename to contrib/hbxdiff/3rd/libxdiff/xversion.c diff --git a/harbour/contrib/hbxdiff/core.c b/contrib/hbxdiff/core.c similarity index 100% rename from harbour/contrib/hbxdiff/core.c rename to contrib/hbxdiff/core.c diff --git a/harbour/contrib/hbxdiff/hbxdiff.ch b/contrib/hbxdiff/hbxdiff.ch similarity index 100% rename from harbour/contrib/hbxdiff/hbxdiff.ch rename to contrib/hbxdiff/hbxdiff.ch diff --git a/harbour/contrib/hbxdiff/hbxdiff.hbc b/contrib/hbxdiff/hbxdiff.hbc similarity index 100% rename from harbour/contrib/hbxdiff/hbxdiff.hbc rename to contrib/hbxdiff/hbxdiff.hbc diff --git a/harbour/contrib/hbxdiff/hbxdiff.hbp b/contrib/hbxdiff/hbxdiff.hbp similarity index 100% rename from harbour/contrib/hbxdiff/hbxdiff.hbp rename to contrib/hbxdiff/hbxdiff.hbp diff --git a/harbour/contrib/hbxdiff/hbxdiff.hbx b/contrib/hbxdiff/hbxdiff.hbx similarity index 100% rename from harbour/contrib/hbxdiff/hbxdiff.hbx rename to contrib/hbxdiff/hbxdiff.hbx diff --git a/harbour/contrib/hbxdiff/tests/hbmk.hbm b/contrib/hbxdiff/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbxdiff/tests/hbmk.hbm rename to contrib/hbxdiff/tests/hbmk.hbm diff --git a/harbour/contrib/hbxdiff/tests/test.prg b/contrib/hbxdiff/tests/test.prg similarity index 100% rename from harbour/contrib/hbxdiff/tests/test.prg rename to contrib/hbxdiff/tests/test.prg diff --git a/harbour/contrib/hbxdiff/tests/test2.prg b/contrib/hbxdiff/tests/test2.prg similarity index 100% rename from harbour/contrib/hbxdiff/tests/test2.prg rename to contrib/hbxdiff/tests/test2.prg diff --git a/harbour/contrib/hbxdiff/tests/test3.prg b/contrib/hbxdiff/tests/test3.prg similarity index 100% rename from harbour/contrib/hbxdiff/tests/test3.prg rename to contrib/hbxdiff/tests/test3.prg diff --git a/harbour/contrib/hbxpp/binnumx.c b/contrib/hbxpp/binnumx.c similarity index 100% rename from harbour/contrib/hbxpp/binnumx.c rename to contrib/hbxpp/binnumx.c diff --git a/harbour/contrib/hbxpp/browdbx.prg b/contrib/hbxpp/browdbx.prg similarity index 100% rename from harbour/contrib/hbxpp/browdbx.prg rename to contrib/hbxpp/browdbx.prg diff --git a/harbour/contrib/hbxpp/dbcmdx.c b/contrib/hbxpp/dbcmdx.c similarity index 100% rename from harbour/contrib/hbxpp/dbcmdx.c rename to contrib/hbxpp/dbcmdx.c diff --git a/harbour/contrib/hbxpp/dbdetacx.c b/contrib/hbxpp/dbdetacx.c similarity index 100% rename from harbour/contrib/hbxpp/dbdetacx.c rename to contrib/hbxpp/dbdetacx.c diff --git a/harbour/contrib/hbxpp/dbfuncsx.prg b/contrib/hbxpp/dbfuncsx.prg similarity index 100% rename from harbour/contrib/hbxpp/dbfuncsx.prg rename to contrib/hbxpp/dbfuncsx.prg diff --git a/harbour/contrib/hbxpp/dbjoinx.prg b/contrib/hbxpp/dbjoinx.prg similarity index 100% rename from harbour/contrib/hbxpp/dbjoinx.prg rename to contrib/hbxpp/dbjoinx.prg diff --git a/harbour/contrib/hbxpp/dblistx.prg b/contrib/hbxpp/dblistx.prg similarity index 100% rename from harbour/contrib/hbxpp/dblistx.prg rename to contrib/hbxpp/dblistx.prg diff --git a/harbour/contrib/hbxpp/dbsortx.prg b/contrib/hbxpp/dbsortx.prg similarity index 100% rename from harbour/contrib/hbxpp/dbsortx.prg rename to contrib/hbxpp/dbsortx.prg diff --git a/harbour/contrib/hbxpp/dbstruxx.prg b/contrib/hbxpp/dbstruxx.prg similarity index 100% rename from harbour/contrib/hbxpp/dbstruxx.prg rename to contrib/hbxpp/dbstruxx.prg diff --git a/harbour/contrib/hbxpp/dbtotalx.prg b/contrib/hbxpp/dbtotalx.prg similarity index 100% rename from harbour/contrib/hbxpp/dbtotalx.prg rename to contrib/hbxpp/dbtotalx.prg diff --git a/harbour/contrib/hbxpp/dbupdatx.prg b/contrib/hbxpp/dbupdatx.prg similarity index 100% rename from harbour/contrib/hbxpp/dbupdatx.prg rename to contrib/hbxpp/dbupdatx.prg diff --git a/harbour/contrib/hbxpp/dll.ch b/contrib/hbxpp/dll.ch similarity index 100% rename from harbour/contrib/hbxpp/dll.ch rename to contrib/hbxpp/dll.ch diff --git a/harbour/contrib/hbxpp/dllx.c b/contrib/hbxpp/dllx.c similarity index 100% rename from harbour/contrib/hbxpp/dllx.c rename to contrib/hbxpp/dllx.c diff --git a/harbour/contrib/hbxpp/dmlb.ch b/contrib/hbxpp/dmlb.ch similarity index 100% rename from harbour/contrib/hbxpp/dmlb.ch rename to contrib/hbxpp/dmlb.ch diff --git a/harbour/contrib/hbxpp/hbxpp.ch b/contrib/hbxpp/hbxpp.ch similarity index 100% rename from harbour/contrib/hbxpp/hbxpp.ch rename to contrib/hbxpp/hbxpp.ch diff --git a/harbour/contrib/hbxpp/hbxpp.hbc b/contrib/hbxpp/hbxpp.hbc similarity index 100% rename from harbour/contrib/hbxpp/hbxpp.hbc rename to contrib/hbxpp/hbxpp.hbc diff --git a/harbour/contrib/hbxpp/hbxpp.hbp b/contrib/hbxpp/hbxpp.hbp similarity index 100% rename from harbour/contrib/hbxpp/hbxpp.hbp rename to contrib/hbxpp/hbxpp.hbp diff --git a/harbour/contrib/hbxpp/hbxpp.hbx b/contrib/hbxpp/hbxpp.hbx similarity index 100% rename from harbour/contrib/hbxpp/hbxpp.hbx rename to contrib/hbxpp/hbxpp.hbx diff --git a/harbour/contrib/hbxpp/idlex.c b/contrib/hbxpp/idlex.c similarity index 100% rename from harbour/contrib/hbxpp/idlex.c rename to contrib/hbxpp/idlex.c diff --git a/harbour/contrib/hbxpp/mousex.c b/contrib/hbxpp/mousex.c similarity index 100% rename from harbour/contrib/hbxpp/mousex.c rename to contrib/hbxpp/mousex.c diff --git a/harbour/contrib/hbxpp/oemansix.c b/contrib/hbxpp/oemansix.c similarity index 100% rename from harbour/contrib/hbxpp/oemansix.c rename to contrib/hbxpp/oemansix.c diff --git a/harbour/contrib/hbxpp/philesx.c b/contrib/hbxpp/philesx.c similarity index 100% rename from harbour/contrib/hbxpp/philesx.c rename to contrib/hbxpp/philesx.c diff --git a/harbour/contrib/hbxpp/runshell.prg b/contrib/hbxpp/runshell.prg similarity index 100% rename from harbour/contrib/hbxpp/runshell.prg rename to contrib/hbxpp/runshell.prg diff --git a/harbour/contrib/hbxpp/tbcolumx.prg b/contrib/hbxpp/tbcolumx.prg similarity index 100% rename from harbour/contrib/hbxpp/tbcolumx.prg rename to contrib/hbxpp/tbcolumx.prg diff --git a/harbour/contrib/hbxpp/tbrowsex.prg b/contrib/hbxpp/tbrowsex.prg similarity index 100% rename from harbour/contrib/hbxpp/tbrowsex.prg rename to contrib/hbxpp/tbrowsex.prg diff --git a/harbour/contrib/hbxpp/tests/dllcall.prg b/contrib/hbxpp/tests/dllcall.prg similarity index 100% rename from harbour/contrib/hbxpp/tests/dllcall.prg rename to contrib/hbxpp/tests/dllcall.prg diff --git a/harbour/contrib/hbxpp/tests/hbmk.hbm b/contrib/hbxpp/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbxpp/tests/hbmk.hbm rename to contrib/hbxpp/tests/hbmk.hbm diff --git a/harbour/contrib/hbxpp/tests/opover.prg b/contrib/hbxpp/tests/opover.prg similarity index 100% rename from harbour/contrib/hbxpp/tests/opover.prg rename to contrib/hbxpp/tests/opover.prg diff --git a/harbour/contrib/hbxpp/tgetx.prg b/contrib/hbxpp/tgetx.prg similarity index 100% rename from harbour/contrib/hbxpp/tgetx.prg rename to contrib/hbxpp/tgetx.prg diff --git a/harbour/contrib/hbxpp/thfuncx.prg b/contrib/hbxpp/thfuncx.prg similarity index 100% rename from harbour/contrib/hbxpp/thfuncx.prg rename to contrib/hbxpp/thfuncx.prg diff --git a/harbour/contrib/hbxpp/thread.ch b/contrib/hbxpp/thread.ch similarity index 100% rename from harbour/contrib/hbxpp/thread.ch rename to contrib/hbxpp/thread.ch diff --git a/harbour/contrib/hbxpp/tthreadx.prg b/contrib/hbxpp/tthreadx.prg similarity index 100% rename from harbour/contrib/hbxpp/tthreadx.prg rename to contrib/hbxpp/tthreadx.prg diff --git a/harbour/contrib/hbxpp/typefilx.prg b/contrib/hbxpp/typefilx.prg similarity index 100% rename from harbour/contrib/hbxpp/typefilx.prg rename to contrib/hbxpp/typefilx.prg diff --git a/harbour/contrib/hbxpp/wafuncx.c b/contrib/hbxpp/wafuncx.c similarity index 100% rename from harbour/contrib/hbxpp/wafuncx.c rename to contrib/hbxpp/wafuncx.c diff --git a/harbour/contrib/hbxpp/xppop.prg b/contrib/hbxpp/xppop.prg similarity index 100% rename from harbour/contrib/hbxpp/xppop.prg rename to contrib/hbxpp/xppop.prg diff --git a/harbour/contrib/hbxpp/xppopc.c b/contrib/hbxpp/xppopc.c similarity index 100% rename from harbour/contrib/hbxpp/xppopc.c rename to contrib/hbxpp/xppopc.c diff --git a/harbour/contrib/hbzebra/codabar.c b/contrib/hbzebra/codabar.c similarity index 100% rename from harbour/contrib/hbzebra/codabar.c rename to contrib/hbzebra/codabar.c diff --git a/harbour/contrib/hbzebra/code11.c b/contrib/hbzebra/code11.c similarity index 100% rename from harbour/contrib/hbzebra/code11.c rename to contrib/hbzebra/code11.c diff --git a/harbour/contrib/hbzebra/code128.c b/contrib/hbzebra/code128.c similarity index 100% rename from harbour/contrib/hbzebra/code128.c rename to contrib/hbzebra/code128.c diff --git a/harbour/contrib/hbzebra/code39.c b/contrib/hbzebra/code39.c similarity index 100% rename from harbour/contrib/hbzebra/code39.c rename to contrib/hbzebra/code39.c diff --git a/harbour/contrib/hbzebra/code93.c b/contrib/hbzebra/code93.c similarity index 100% rename from harbour/contrib/hbzebra/code93.c rename to contrib/hbzebra/code93.c diff --git a/harbour/contrib/hbzebra/core.c b/contrib/hbzebra/core.c similarity index 100% rename from harbour/contrib/hbzebra/core.c rename to contrib/hbzebra/core.c diff --git a/harbour/contrib/hbzebra/coredraw.c b/contrib/hbzebra/coredraw.c similarity index 100% rename from harbour/contrib/hbzebra/coredraw.c rename to contrib/hbzebra/coredraw.c diff --git a/harbour/contrib/hbzebra/datamtrx.c b/contrib/hbzebra/datamtrx.c similarity index 100% rename from harbour/contrib/hbzebra/datamtrx.c rename to contrib/hbzebra/datamtrx.c diff --git a/harbour/contrib/hbzebra/eanupc.c b/contrib/hbzebra/eanupc.c similarity index 100% rename from harbour/contrib/hbzebra/eanupc.c rename to contrib/hbzebra/eanupc.c diff --git a/harbour/contrib/hbzebra/hbzebra.ch b/contrib/hbzebra/hbzebra.ch similarity index 100% rename from harbour/contrib/hbzebra/hbzebra.ch rename to contrib/hbzebra/hbzebra.ch diff --git a/harbour/contrib/hbzebra/hbzebra.h b/contrib/hbzebra/hbzebra.h similarity index 100% rename from harbour/contrib/hbzebra/hbzebra.h rename to contrib/hbzebra/hbzebra.h diff --git a/harbour/contrib/hbzebra/hbzebra.hbc b/contrib/hbzebra/hbzebra.hbc similarity index 100% rename from harbour/contrib/hbzebra/hbzebra.hbc rename to contrib/hbzebra/hbzebra.hbc diff --git a/harbour/contrib/hbzebra/hbzebra.hbp b/contrib/hbzebra/hbzebra.hbp similarity index 100% rename from harbour/contrib/hbzebra/hbzebra.hbp rename to contrib/hbzebra/hbzebra.hbp diff --git a/harbour/contrib/hbzebra/hbzebra.hbx b/contrib/hbzebra/hbzebra.hbx similarity index 100% rename from harbour/contrib/hbzebra/hbzebra.hbx rename to contrib/hbzebra/hbzebra.hbx diff --git a/harbour/contrib/hbzebra/itf.c b/contrib/hbzebra/itf.c similarity index 100% rename from harbour/contrib/hbzebra/itf.c rename to contrib/hbzebra/itf.c diff --git a/harbour/contrib/hbzebra/msi.c b/contrib/hbzebra/msi.c similarity index 100% rename from harbour/contrib/hbzebra/msi.c rename to contrib/hbzebra/msi.c diff --git a/harbour/contrib/hbzebra/pdf417.c b/contrib/hbzebra/pdf417.c similarity index 100% rename from harbour/contrib/hbzebra/pdf417.c rename to contrib/hbzebra/pdf417.c diff --git a/harbour/contrib/hbzebra/qrcode.c b/contrib/hbzebra/qrcode.c similarity index 100% rename from harbour/contrib/hbzebra/qrcode.c rename to contrib/hbzebra/qrcode.c diff --git a/harbour/contrib/hbzebra/tests/cairo.prg b/contrib/hbzebra/tests/cairo.prg similarity index 100% rename from harbour/contrib/hbzebra/tests/cairo.prg rename to contrib/hbzebra/tests/cairo.prg diff --git a/harbour/contrib/hbzebra/tests/harupdf.prg b/contrib/hbzebra/tests/harupdf.prg similarity index 100% rename from harbour/contrib/hbzebra/tests/harupdf.prg rename to contrib/hbzebra/tests/harupdf.prg diff --git a/harbour/contrib/hbzebra/tests/hbmk.hbm b/contrib/hbzebra/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbzebra/tests/hbmk.hbm rename to contrib/hbzebra/tests/hbmk.hbm diff --git a/harbour/contrib/hbzebra/tests/wingdi.prg b/contrib/hbzebra/tests/wingdi.prg similarity index 100% rename from harbour/contrib/hbzebra/tests/wingdi.prg rename to contrib/hbzebra/tests/wingdi.prg diff --git a/harbour/contrib/hbziparc/doc/en/hbziparc.txt b/contrib/hbziparc/doc/en/hbziparc.txt similarity index 100% rename from harbour/contrib/hbziparc/doc/en/hbziparc.txt rename to contrib/hbziparc/doc/en/hbziparc.txt diff --git a/harbour/contrib/hbziparc/hbziparc.hbc b/contrib/hbziparc/hbziparc.hbc similarity index 100% rename from harbour/contrib/hbziparc/hbziparc.hbc rename to contrib/hbziparc/hbziparc.hbc diff --git a/harbour/contrib/hbziparc/hbziparc.hbp b/contrib/hbziparc/hbziparc.hbp similarity index 100% rename from harbour/contrib/hbziparc/hbziparc.hbp rename to contrib/hbziparc/hbziparc.hbp diff --git a/harbour/contrib/hbziparc/hbziparc.hbx b/contrib/hbziparc/hbziparc.hbx similarity index 100% rename from harbour/contrib/hbziparc/hbziparc.hbx rename to contrib/hbziparc/hbziparc.hbx diff --git a/harbour/contrib/hbziparc/tests/hbmk.hbm b/contrib/hbziparc/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/hbziparc/tests/hbmk.hbm rename to contrib/hbziparc/tests/hbmk.hbm diff --git a/harbour/contrib/hbziparc/tests/unzipa.prg b/contrib/hbziparc/tests/unzipa.prg similarity index 100% rename from harbour/contrib/hbziparc/tests/unzipa.prg rename to contrib/hbziparc/tests/unzipa.prg diff --git a/harbour/contrib/hbziparc/tests/zipa.prg b/contrib/hbziparc/tests/zipa.prg similarity index 100% rename from harbour/contrib/hbziparc/tests/zipa.prg rename to contrib/hbziparc/tests/zipa.prg diff --git a/harbour/contrib/hbziparc/ziparc.prg b/contrib/hbziparc/ziparc.prg similarity index 100% rename from harbour/contrib/hbziparc/ziparc.prg rename to contrib/hbziparc/ziparc.prg diff --git a/harbour/contrib/make.hb b/contrib/make.hb similarity index 100% rename from harbour/contrib/make.hb rename to contrib/make.hb diff --git a/harbour/contrib/rddads/ads.ch b/contrib/rddads/ads.ch similarity index 100% rename from harbour/contrib/rddads/ads.ch rename to contrib/rddads/ads.ch diff --git a/harbour/contrib/rddads/ads1.c b/contrib/rddads/ads1.c similarity index 100% rename from harbour/contrib/rddads/ads1.c rename to contrib/rddads/ads1.c diff --git a/harbour/contrib/rddads/adsfunc.c b/contrib/rddads/adsfunc.c similarity index 100% rename from harbour/contrib/rddads/adsfunc.c rename to contrib/rddads/adsfunc.c diff --git a/harbour/contrib/rddads/adsmgmnt.c b/contrib/rddads/adsmgmnt.c similarity index 100% rename from harbour/contrib/rddads/adsmgmnt.c rename to contrib/rddads/adsmgmnt.c diff --git a/harbour/contrib/rddads/adsx.c b/contrib/rddads/adsx.c similarity index 100% rename from harbour/contrib/rddads/adsx.c rename to contrib/rddads/adsx.c diff --git a/harbour/contrib/rddads/doc/en/adsfuncs.txt b/contrib/rddads/doc/en/adsfuncs.txt similarity index 100% rename from harbour/contrib/rddads/doc/en/adsfuncs.txt rename to contrib/rddads/doc/en/adsfuncs.txt diff --git a/harbour/contrib/rddads/doc/en/readme.txt b/contrib/rddads/doc/en/readme.txt similarity index 100% rename from harbour/contrib/rddads/doc/en/readme.txt rename to contrib/rddads/doc/en/readme.txt diff --git a/harbour/contrib/rddads/rddads.h b/contrib/rddads/rddads.h similarity index 100% rename from harbour/contrib/rddads/rddads.h rename to contrib/rddads/rddads.h diff --git a/harbour/contrib/rddads/rddads.hbc b/contrib/rddads/rddads.hbc similarity index 100% rename from harbour/contrib/rddads/rddads.hbc rename to contrib/rddads/rddads.hbc diff --git a/harbour/contrib/rddads/rddads.hbp b/contrib/rddads/rddads.hbp similarity index 100% rename from harbour/contrib/rddads/rddads.hbp rename to contrib/rddads/rddads.hbp diff --git a/harbour/contrib/rddads/rddads.hbx b/contrib/rddads/rddads.hbx similarity index 100% rename from harbour/contrib/rddads/rddads.hbx rename to contrib/rddads/rddads.hbx diff --git a/harbour/contrib/rddads/readme.txt b/contrib/rddads/readme.txt similarity index 100% rename from harbour/contrib/rddads/readme.txt rename to contrib/rddads/readme.txt diff --git a/harbour/contrib/rddads/tests/datad.prg b/contrib/rddads/tests/datad.prg similarity index 100% rename from harbour/contrib/rddads/tests/datad.prg rename to contrib/rddads/tests/datad.prg diff --git a/harbour/contrib/rddads/tests/hbmk.hbm b/contrib/rddads/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/rddads/tests/hbmk.hbm rename to contrib/rddads/tests/hbmk.hbm diff --git a/harbour/contrib/rddads/tests/manage.prg b/contrib/rddads/tests/manage.prg similarity index 100% rename from harbour/contrib/rddads/tests/manage.prg rename to contrib/rddads/tests/manage.prg diff --git a/harbour/contrib/rddads/unixutils.h b/contrib/rddads/unixutils.h similarity index 100% rename from harbour/contrib/rddads/unixutils.h rename to contrib/rddads/unixutils.h diff --git a/harbour/contrib/rddbm/bmdbfcdx.prg b/contrib/rddbm/bmdbfcdx.prg similarity index 100% rename from harbour/contrib/rddbm/bmdbfcdx.prg rename to contrib/rddbm/bmdbfcdx.prg diff --git a/harbour/contrib/rddbm/bmdbfnsx.prg b/contrib/rddbm/bmdbfnsx.prg similarity index 100% rename from harbour/contrib/rddbm/bmdbfnsx.prg rename to contrib/rddbm/bmdbfnsx.prg diff --git a/harbour/contrib/rddbm/bmdbfntx.prg b/contrib/rddbm/bmdbfntx.prg similarity index 100% rename from harbour/contrib/rddbm/bmdbfntx.prg rename to contrib/rddbm/bmdbfntx.prg diff --git a/harbour/contrib/rddbm/bmdbfx.c b/contrib/rddbm/bmdbfx.c similarity index 100% rename from harbour/contrib/rddbm/bmdbfx.c rename to contrib/rddbm/bmdbfx.c diff --git a/harbour/contrib/rddbm/rddbm.hbc b/contrib/rddbm/rddbm.hbc similarity index 100% rename from harbour/contrib/rddbm/rddbm.hbc rename to contrib/rddbm/rddbm.hbc diff --git a/harbour/contrib/rddbm/rddbm.hbp b/contrib/rddbm/rddbm.hbp similarity index 100% rename from harbour/contrib/rddbm/rddbm.hbp rename to contrib/rddbm/rddbm.hbp diff --git a/harbour/contrib/rddbm/rddbm.hbx b/contrib/rddbm/rddbm.hbx similarity index 100% rename from harbour/contrib/rddbm/rddbm.hbx rename to contrib/rddbm/rddbm.hbx diff --git a/harbour/contrib/rddsql/hbrddsql.ch b/contrib/rddsql/hbrddsql.ch similarity index 100% rename from harbour/contrib/rddsql/hbrddsql.ch rename to contrib/rddsql/hbrddsql.ch diff --git a/harbour/contrib/rddsql/hbrddsql.h b/contrib/rddsql/hbrddsql.h similarity index 100% rename from harbour/contrib/rddsql/hbrddsql.h rename to contrib/rddsql/hbrddsql.h diff --git a/harbour/contrib/rddsql/rddsql.hbc b/contrib/rddsql/rddsql.hbc similarity index 100% rename from harbour/contrib/rddsql/rddsql.hbc rename to contrib/rddsql/rddsql.hbc diff --git a/harbour/contrib/rddsql/rddsql.hbp b/contrib/rddsql/rddsql.hbp similarity index 100% rename from harbour/contrib/rddsql/rddsql.hbp rename to contrib/rddsql/rddsql.hbp diff --git a/harbour/contrib/rddsql/readme.txt b/contrib/rddsql/readme.txt similarity index 100% rename from harbour/contrib/rddsql/readme.txt rename to contrib/rddsql/readme.txt diff --git a/harbour/contrib/rddsql/sqlbase.c b/contrib/rddsql/sqlbase.c similarity index 100% rename from harbour/contrib/rddsql/sqlbase.c rename to contrib/rddsql/sqlbase.c diff --git a/harbour/contrib/rddsql/sqlmix.c b/contrib/rddsql/sqlmix.c similarity index 100% rename from harbour/contrib/rddsql/sqlmix.c rename to contrib/rddsql/sqlmix.c diff --git a/harbour/contrib/rddsql/tests/arrayrdd.prg b/contrib/rddsql/tests/arrayrdd.prg similarity index 100% rename from harbour/contrib/rddsql/tests/arrayrdd.prg rename to contrib/rddsql/tests/arrayrdd.prg diff --git a/harbour/contrib/rddsql/tests/hbmk.hbm b/contrib/rddsql/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/rddsql/tests/hbmk.hbm rename to contrib/rddsql/tests/hbmk.hbm diff --git a/harbour/contrib/sddfb/core.c b/contrib/sddfb/core.c similarity index 100% rename from harbour/contrib/sddfb/core.c rename to contrib/sddfb/core.c diff --git a/harbour/contrib/sddfb/sddfb.hbc b/contrib/sddfb/sddfb.hbc similarity index 100% rename from harbour/contrib/sddfb/sddfb.hbc rename to contrib/sddfb/sddfb.hbc diff --git a/harbour/contrib/sddfb/sddfb.hbp b/contrib/sddfb/sddfb.hbp similarity index 100% rename from harbour/contrib/sddfb/sddfb.hbp rename to contrib/sddfb/sddfb.hbp diff --git a/harbour/contrib/sddfb/sddfb.hbx b/contrib/sddfb/sddfb.hbx similarity index 100% rename from harbour/contrib/sddfb/sddfb.hbx rename to contrib/sddfb/sddfb.hbx diff --git a/harbour/contrib/sddfb/tests/hbmk.hbm b/contrib/sddfb/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/sddfb/tests/hbmk.hbm rename to contrib/sddfb/tests/hbmk.hbm diff --git a/harbour/contrib/sddmy/core.c b/contrib/sddmy/core.c similarity index 100% rename from harbour/contrib/sddmy/core.c rename to contrib/sddmy/core.c diff --git a/harbour/contrib/sddmy/sddmy.hbc b/contrib/sddmy/sddmy.hbc similarity index 100% rename from harbour/contrib/sddmy/sddmy.hbc rename to contrib/sddmy/sddmy.hbc diff --git a/harbour/contrib/sddmy/sddmy.hbp b/contrib/sddmy/sddmy.hbp similarity index 100% rename from harbour/contrib/sddmy/sddmy.hbp rename to contrib/sddmy/sddmy.hbp diff --git a/harbour/contrib/sddmy/sddmy.hbx b/contrib/sddmy/sddmy.hbx similarity index 100% rename from harbour/contrib/sddmy/sddmy.hbx rename to contrib/sddmy/sddmy.hbx diff --git a/harbour/contrib/sddmy/tests/hbmk.hbm b/contrib/sddmy/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/sddmy/tests/hbmk.hbm rename to contrib/sddmy/tests/hbmk.hbm diff --git a/harbour/contrib/sddmy/tests/test1.prg b/contrib/sddmy/tests/test1.prg similarity index 100% rename from harbour/contrib/sddmy/tests/test1.prg rename to contrib/sddmy/tests/test1.prg diff --git a/harbour/contrib/sddoci/core.c b/contrib/sddoci/core.c similarity index 100% rename from harbour/contrib/sddoci/core.c rename to contrib/sddoci/core.c diff --git a/harbour/contrib/sddoci/sddoci.hbc b/contrib/sddoci/sddoci.hbc similarity index 100% rename from harbour/contrib/sddoci/sddoci.hbc rename to contrib/sddoci/sddoci.hbc diff --git a/harbour/contrib/sddoci/sddoci.hbp b/contrib/sddoci/sddoci.hbp similarity index 100% rename from harbour/contrib/sddoci/sddoci.hbp rename to contrib/sddoci/sddoci.hbp diff --git a/harbour/contrib/sddoci/sddoci.hbx b/contrib/sddoci/sddoci.hbx similarity index 100% rename from harbour/contrib/sddoci/sddoci.hbx rename to contrib/sddoci/sddoci.hbx diff --git a/harbour/contrib/sddoci/tests/hbmk.hbm b/contrib/sddoci/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/sddoci/tests/hbmk.hbm rename to contrib/sddoci/tests/hbmk.hbm diff --git a/harbour/contrib/sddoci/tests/test1.prg b/contrib/sddoci/tests/test1.prg similarity index 100% rename from harbour/contrib/sddoci/tests/test1.prg rename to contrib/sddoci/tests/test1.prg diff --git a/harbour/contrib/sddodbc/core.c b/contrib/sddodbc/core.c similarity index 100% rename from harbour/contrib/sddodbc/core.c rename to contrib/sddodbc/core.c diff --git a/harbour/contrib/sddodbc/sddodbc.hbc b/contrib/sddodbc/sddodbc.hbc similarity index 100% rename from harbour/contrib/sddodbc/sddodbc.hbc rename to contrib/sddodbc/sddodbc.hbc diff --git a/harbour/contrib/sddodbc/sddodbc.hbp b/contrib/sddodbc/sddodbc.hbp similarity index 100% rename from harbour/contrib/sddodbc/sddodbc.hbp rename to contrib/sddodbc/sddodbc.hbp diff --git a/harbour/contrib/sddodbc/sddodbc.hbx b/contrib/sddodbc/sddodbc.hbx similarity index 100% rename from harbour/contrib/sddodbc/sddodbc.hbx rename to contrib/sddodbc/sddodbc.hbx diff --git a/harbour/contrib/sddodbc/tests/hbmk.hbm b/contrib/sddodbc/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/sddodbc/tests/hbmk.hbm rename to contrib/sddodbc/tests/hbmk.hbm diff --git a/harbour/contrib/sddodbc/tests/test1.prg b/contrib/sddodbc/tests/test1.prg similarity index 100% rename from harbour/contrib/sddodbc/tests/test1.prg rename to contrib/sddodbc/tests/test1.prg diff --git a/harbour/contrib/sddodbc/tests/test2.prg b/contrib/sddodbc/tests/test2.prg similarity index 100% rename from harbour/contrib/sddodbc/tests/test2.prg rename to contrib/sddodbc/tests/test2.prg diff --git a/harbour/contrib/sddpg/core.c b/contrib/sddpg/core.c similarity index 100% rename from harbour/contrib/sddpg/core.c rename to contrib/sddpg/core.c diff --git a/harbour/contrib/sddpg/sddpg.hbc b/contrib/sddpg/sddpg.hbc similarity index 100% rename from harbour/contrib/sddpg/sddpg.hbc rename to contrib/sddpg/sddpg.hbc diff --git a/harbour/contrib/sddpg/sddpg.hbp b/contrib/sddpg/sddpg.hbp similarity index 100% rename from harbour/contrib/sddpg/sddpg.hbp rename to contrib/sddpg/sddpg.hbp diff --git a/harbour/contrib/sddpg/sddpg.hbx b/contrib/sddpg/sddpg.hbx similarity index 100% rename from harbour/contrib/sddpg/sddpg.hbx rename to contrib/sddpg/sddpg.hbx diff --git a/harbour/contrib/sddpg/tests/hbmk.hbm b/contrib/sddpg/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/sddpg/tests/hbmk.hbm rename to contrib/sddpg/tests/hbmk.hbm diff --git a/harbour/contrib/sddsqlt3/core.c b/contrib/sddsqlt3/core.c similarity index 100% rename from harbour/contrib/sddsqlt3/core.c rename to contrib/sddsqlt3/core.c diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbc b/contrib/sddsqlt3/sddsqlt3.hbc similarity index 100% rename from harbour/contrib/sddsqlt3/sddsqlt3.hbc rename to contrib/sddsqlt3/sddsqlt3.hbc diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbp b/contrib/sddsqlt3/sddsqlt3.hbp similarity index 100% rename from harbour/contrib/sddsqlt3/sddsqlt3.hbp rename to contrib/sddsqlt3/sddsqlt3.hbp diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbx b/contrib/sddsqlt3/sddsqlt3.hbx similarity index 100% rename from harbour/contrib/sddsqlt3/sddsqlt3.hbx rename to contrib/sddsqlt3/sddsqlt3.hbx diff --git a/harbour/contrib/sddsqlt3/tests/hbmk.hbm b/contrib/sddsqlt3/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/sddsqlt3/tests/hbmk.hbm rename to contrib/sddsqlt3/tests/hbmk.hbm diff --git a/harbour/contrib/sddsqlt3/tests/test.prg b/contrib/sddsqlt3/tests/test.prg similarity index 100% rename from harbour/contrib/sddsqlt3/tests/test.prg rename to contrib/sddsqlt3/tests/test.prg diff --git a/harbour/contrib/sddsqlt3/tests/test.sq3 b/contrib/sddsqlt3/tests/test.sq3 similarity index 100% rename from harbour/contrib/sddsqlt3/tests/test.sq3 rename to contrib/sddsqlt3/tests/test.sq3 diff --git a/harbour/contrib/xhb/arrayblk.prg b/contrib/xhb/arrayblk.prg similarity index 100% rename from harbour/contrib/xhb/arrayblk.prg rename to contrib/xhb/arrayblk.prg diff --git a/harbour/contrib/xhb/bkgtsks.c b/contrib/xhb/bkgtsks.c similarity index 100% rename from harbour/contrib/xhb/bkgtsks.c rename to contrib/xhb/bkgtsks.c diff --git a/harbour/contrib/xhb/cgi.ch b/contrib/xhb/cgi.ch similarity index 100% rename from harbour/contrib/xhb/cgi.ch rename to contrib/xhb/cgi.ch diff --git a/harbour/contrib/xhb/classex.ch b/contrib/xhb/classex.ch similarity index 100% rename from harbour/contrib/xhb/classex.ch rename to contrib/xhb/classex.ch diff --git a/harbour/contrib/xhb/cstruct.ch b/contrib/xhb/cstruct.ch similarity index 100% rename from harbour/contrib/xhb/cstruct.ch rename to contrib/xhb/cstruct.ch diff --git a/harbour/contrib/xhb/cstruct.prg b/contrib/xhb/cstruct.prg similarity index 100% rename from harbour/contrib/xhb/cstruct.prg rename to contrib/xhb/cstruct.prg diff --git a/harbour/contrib/xhb/cstructc.c b/contrib/xhb/cstructc.c similarity index 100% rename from harbour/contrib/xhb/cstructc.c rename to contrib/xhb/cstructc.c diff --git a/harbour/contrib/xhb/datesxhb.c b/contrib/xhb/datesxhb.c similarity index 100% rename from harbour/contrib/xhb/datesxhb.c rename to contrib/xhb/datesxhb.c diff --git a/harbour/contrib/xhb/dbf2txt.c b/contrib/xhb/dbf2txt.c similarity index 100% rename from harbour/contrib/xhb/dbf2txt.c rename to contrib/xhb/dbf2txt.c diff --git a/harbour/contrib/xhb/dbgfx.prg b/contrib/xhb/dbgfx.prg similarity index 100% rename from harbour/contrib/xhb/dbgfx.prg rename to contrib/xhb/dbgfx.prg diff --git a/harbour/contrib/xhb/dbgfxc.c b/contrib/xhb/dbgfxc.c similarity index 100% rename from harbour/contrib/xhb/dbgfxc.c rename to contrib/xhb/dbgfxc.c diff --git a/harbour/contrib/xhb/decode.prg b/contrib/xhb/decode.prg similarity index 100% rename from harbour/contrib/xhb/decode.prg rename to contrib/xhb/decode.prg diff --git a/harbour/contrib/xhb/dirrec.prg b/contrib/xhb/dirrec.prg similarity index 100% rename from harbour/contrib/xhb/dirrec.prg rename to contrib/xhb/dirrec.prg diff --git a/harbour/contrib/xhb/diskhb.prg b/contrib/xhb/diskhb.prg similarity index 100% rename from harbour/contrib/xhb/diskhb.prg rename to contrib/xhb/diskhb.prg diff --git a/harbour/contrib/xhb/dumpvar.prg b/contrib/xhb/dumpvar.prg similarity index 100% rename from harbour/contrib/xhb/dumpvar.prg rename to contrib/xhb/dumpvar.prg diff --git a/harbour/contrib/xhb/filestat.c b/contrib/xhb/filestat.c similarity index 100% rename from harbour/contrib/xhb/filestat.c rename to contrib/xhb/filestat.c diff --git a/harbour/contrib/xhb/fparse.c b/contrib/xhb/fparse.c similarity index 100% rename from harbour/contrib/xhb/fparse.c rename to contrib/xhb/fparse.c diff --git a/harbour/contrib/xhb/freadlin.c b/contrib/xhb/freadlin.c similarity index 100% rename from harbour/contrib/xhb/freadlin.c rename to contrib/xhb/freadlin.c diff --git a/harbour/contrib/xhb/hbcommon.ch b/contrib/xhb/hbcommon.ch similarity index 100% rename from harbour/contrib/xhb/hbcommon.ch rename to contrib/xhb/hbcommon.ch diff --git a/harbour/contrib/xhb/hbcompat.ch b/contrib/xhb/hbcompat.ch similarity index 100% rename from harbour/contrib/xhb/hbcompat.ch rename to contrib/xhb/hbcompat.ch diff --git a/harbour/contrib/xhb/hbcompat.h b/contrib/xhb/hbcompat.h similarity index 100% rename from harbour/contrib/xhb/hbcompat.h rename to contrib/xhb/hbcompat.h diff --git a/harbour/contrib/xhb/hbcomprs.ch b/contrib/xhb/hbcomprs.ch similarity index 100% rename from harbour/contrib/xhb/hbcomprs.ch rename to contrib/xhb/hbcomprs.ch diff --git a/harbour/contrib/xhb/hbcomprs.prg b/contrib/xhb/hbcomprs.prg similarity index 100% rename from harbour/contrib/xhb/hbcomprs.prg rename to contrib/xhb/hbcomprs.prg diff --git a/harbour/contrib/xhb/hbcrypt.c b/contrib/xhb/hbcrypt.c similarity index 100% rename from harbour/contrib/xhb/hbcrypt.c rename to contrib/xhb/hbcrypt.c diff --git a/harbour/contrib/xhb/hbctypes.ch b/contrib/xhb/hbctypes.ch similarity index 100% rename from harbour/contrib/xhb/hbctypes.ch rename to contrib/xhb/hbctypes.ch diff --git a/harbour/contrib/xhb/hbdll.ch b/contrib/xhb/hbdll.ch similarity index 100% rename from harbour/contrib/xhb/hbdll.ch rename to contrib/xhb/hbdll.ch diff --git a/harbour/contrib/xhb/hbfast.h b/contrib/xhb/hbfast.h similarity index 100% rename from harbour/contrib/xhb/hbfast.h rename to contrib/xhb/hbfast.h diff --git a/harbour/contrib/xhb/hblog.ch b/contrib/xhb/hblog.ch similarity index 100% rename from harbour/contrib/xhb/hblog.ch rename to contrib/xhb/hblog.ch diff --git a/harbour/contrib/xhb/hblog.prg b/contrib/xhb/hblog.prg similarity index 100% rename from harbour/contrib/xhb/hblog.prg rename to contrib/xhb/hblog.prg diff --git a/harbour/contrib/xhb/hblogdef.ch b/contrib/xhb/hblogdef.ch similarity index 100% rename from harbour/contrib/xhb/hblogdef.ch rename to contrib/xhb/hblogdef.ch diff --git a/harbour/contrib/xhb/hblognet.prg b/contrib/xhb/hblognet.prg similarity index 100% rename from harbour/contrib/xhb/hblognet.prg rename to contrib/xhb/hblognet.prg diff --git a/harbour/contrib/xhb/hbnxs.h b/contrib/xhb/hbnxs.h similarity index 100% rename from harbour/contrib/xhb/hbnxs.h rename to contrib/xhb/hbnxs.h diff --git a/harbour/contrib/xhb/hboutdbg.c b/contrib/xhb/hboutdbg.c similarity index 100% rename from harbour/contrib/xhb/hboutdbg.c rename to contrib/xhb/hboutdbg.c diff --git a/harbour/contrib/xhb/hbrpc.ch b/contrib/xhb/hbrpc.ch similarity index 100% rename from harbour/contrib/xhb/hbrpc.ch rename to contrib/xhb/hbrpc.ch diff --git a/harbour/contrib/xhb/hbserv.c b/contrib/xhb/hbserv.c similarity index 100% rename from harbour/contrib/xhb/hbserv.c rename to contrib/xhb/hbserv.c diff --git a/harbour/contrib/xhb/hbserv.ch b/contrib/xhb/hbserv.ch similarity index 100% rename from harbour/contrib/xhb/hbserv.ch rename to contrib/xhb/hbserv.ch diff --git a/harbour/contrib/xhb/hbserv.h b/contrib/xhb/hbserv.h similarity index 100% rename from harbour/contrib/xhb/hbserv.h rename to contrib/xhb/hbserv.h diff --git a/harbour/contrib/xhb/hbstruct.ch b/contrib/xhb/hbstruct.ch similarity index 100% rename from harbour/contrib/xhb/hbstruct.ch rename to contrib/xhb/hbstruct.ch diff --git a/harbour/contrib/xhb/hbstruct.prg b/contrib/xhb/hbstruct.prg similarity index 100% rename from harbour/contrib/xhb/hbstruct.prg rename to contrib/xhb/hbstruct.prg diff --git a/harbour/contrib/xhb/hbsyslog.c b/contrib/xhb/hbsyslog.c similarity index 100% rename from harbour/contrib/xhb/hbsyslog.c rename to contrib/xhb/hbsyslog.c diff --git a/harbour/contrib/xhb/hbxml.c b/contrib/xhb/hbxml.c similarity index 100% rename from harbour/contrib/xhb/hbxml.c rename to contrib/xhb/hbxml.c diff --git a/harbour/contrib/xhb/hbxml.ch b/contrib/xhb/hbxml.ch similarity index 100% rename from harbour/contrib/xhb/hbxml.ch rename to contrib/xhb/hbxml.ch diff --git a/harbour/contrib/xhb/hbxml.h b/contrib/xhb/hbxml.h similarity index 100% rename from harbour/contrib/xhb/hbxml.h rename to contrib/xhb/hbxml.h diff --git a/harbour/contrib/xhb/hjwindow.prg b/contrib/xhb/hjwindow.prg similarity index 100% rename from harbour/contrib/xhb/hjwindow.prg rename to contrib/xhb/hjwindow.prg diff --git a/harbour/contrib/xhb/hterrsys.prg b/contrib/xhb/hterrsys.prg similarity index 100% rename from harbour/contrib/xhb/hterrsys.prg rename to contrib/xhb/hterrsys.prg diff --git a/harbour/contrib/xhb/htjlist.prg b/contrib/xhb/htjlist.prg similarity index 100% rename from harbour/contrib/xhb/htjlist.prg rename to contrib/xhb/htjlist.prg diff --git a/harbour/contrib/xhb/html.ch b/contrib/xhb/html.ch similarity index 100% rename from harbour/contrib/xhb/html.ch rename to contrib/xhb/html.ch diff --git a/harbour/contrib/xhb/htmlclrs.ch b/contrib/xhb/htmlclrs.ch similarity index 100% rename from harbour/contrib/xhb/htmlclrs.ch rename to contrib/xhb/htmlclrs.ch diff --git a/harbour/contrib/xhb/htmlform.ch b/contrib/xhb/htmlform.ch similarity index 100% rename from harbour/contrib/xhb/htmlform.ch rename to contrib/xhb/htmlform.ch diff --git a/harbour/contrib/xhb/htmutil.prg b/contrib/xhb/htmutil.prg similarity index 100% rename from harbour/contrib/xhb/htmutil.prg rename to contrib/xhb/htmutil.prg diff --git a/harbour/contrib/xhb/inet.h b/contrib/xhb/inet.h similarity index 100% rename from harbour/contrib/xhb/inet.h rename to contrib/xhb/inet.h diff --git a/harbour/contrib/xhb/math.ch b/contrib/xhb/math.ch similarity index 100% rename from harbour/contrib/xhb/math.ch rename to contrib/xhb/math.ch diff --git a/harbour/contrib/xhb/regexrpl.prg b/contrib/xhb/regexrpl.prg similarity index 100% rename from harbour/contrib/xhb/regexrpl.prg rename to contrib/xhb/regexrpl.prg diff --git a/harbour/contrib/xhb/sprintf.prg b/contrib/xhb/sprintf.prg similarity index 100% rename from harbour/contrib/xhb/sprintf.prg rename to contrib/xhb/sprintf.prg diff --git a/harbour/contrib/xhb/stream.prg b/contrib/xhb/stream.prg similarity index 100% rename from harbour/contrib/xhb/stream.prg rename to contrib/xhb/stream.prg diff --git a/harbour/contrib/xhb/tcgi.prg b/contrib/xhb/tcgi.prg similarity index 100% rename from harbour/contrib/xhb/tcgi.prg rename to contrib/xhb/tcgi.prg diff --git a/harbour/contrib/xhb/tedit.prg b/contrib/xhb/tedit.prg similarity index 100% rename from harbour/contrib/xhb/tedit.prg rename to contrib/xhb/tedit.prg diff --git a/harbour/contrib/xhb/tests/compress.prg b/contrib/xhb/tests/compress.prg similarity index 100% rename from harbour/contrib/xhb/tests/compress.prg rename to contrib/xhb/tests/compress.prg diff --git a/harbour/contrib/xhb/tests/copyfile.prg b/contrib/xhb/tests/copyfile.prg similarity index 100% rename from harbour/contrib/xhb/tests/copyfile.prg rename to contrib/xhb/tests/copyfile.prg diff --git a/harbour/contrib/xhb/tests/decode.prg b/contrib/xhb/tests/decode.prg similarity index 100% rename from harbour/contrib/xhb/tests/decode.prg rename to contrib/xhb/tests/decode.prg diff --git a/harbour/contrib/xhb/tests/dll.prg b/contrib/xhb/tests/dll.prg similarity index 100% rename from harbour/contrib/xhb/tests/dll.prg rename to contrib/xhb/tests/dll.prg diff --git a/harbour/contrib/xhb/tests/hbmk.hbm b/contrib/xhb/tests/hbmk.hbm similarity index 100% rename from harbour/contrib/xhb/tests/hbmk.hbm rename to contrib/xhb/tests/hbmk.hbm diff --git a/harbour/contrib/xhb/tests/regexrpl.prg b/contrib/xhb/tests/regexrpl.prg similarity index 100% rename from harbour/contrib/xhb/tests/regexrpl.prg rename to contrib/xhb/tests/regexrpl.prg diff --git a/harbour/contrib/xhb/tests/test.xml b/contrib/xhb/tests/test.xml similarity index 100% rename from harbour/contrib/xhb/tests/test.xml rename to contrib/xhb/tests/test.xml diff --git a/harbour/contrib/xhb/tests/xml1.prg b/contrib/xhb/tests/xml1.prg similarity index 100% rename from harbour/contrib/xhb/tests/xml1.prg rename to contrib/xhb/tests/xml1.prg diff --git a/harbour/contrib/xhb/tfile.prg b/contrib/xhb/tfile.prg similarity index 100% rename from harbour/contrib/xhb/tfile.prg rename to contrib/xhb/tfile.prg diff --git a/harbour/contrib/xhb/tframe.prg b/contrib/xhb/tframe.prg similarity index 100% rename from harbour/contrib/xhb/tframe.prg rename to contrib/xhb/tframe.prg diff --git a/harbour/contrib/xhb/thtm.prg b/contrib/xhb/thtm.prg similarity index 100% rename from harbour/contrib/xhb/thtm.prg rename to contrib/xhb/thtm.prg diff --git a/harbour/contrib/xhb/traceprg.prg b/contrib/xhb/traceprg.prg similarity index 100% rename from harbour/contrib/xhb/traceprg.prg rename to contrib/xhb/traceprg.prg diff --git a/harbour/contrib/xhb/trpc.prg b/contrib/xhb/trpc.prg similarity index 100% rename from harbour/contrib/xhb/trpc.prg rename to contrib/xhb/trpc.prg diff --git a/harbour/contrib/xhb/trpccli.prg b/contrib/xhb/trpccli.prg similarity index 100% rename from harbour/contrib/xhb/trpccli.prg rename to contrib/xhb/trpccli.prg diff --git a/harbour/contrib/xhb/ttable.ch b/contrib/xhb/ttable.ch similarity index 100% rename from harbour/contrib/xhb/ttable.ch rename to contrib/xhb/ttable.ch diff --git a/harbour/contrib/xhb/ttable.prg b/contrib/xhb/ttable.prg similarity index 100% rename from harbour/contrib/xhb/ttable.prg rename to contrib/xhb/ttable.prg diff --git a/harbour/contrib/xhb/txml.prg b/contrib/xhb/txml.prg similarity index 100% rename from harbour/contrib/xhb/txml.prg rename to contrib/xhb/txml.prg diff --git a/harbour/contrib/xhb/txtline.c b/contrib/xhb/txtline.c similarity index 100% rename from harbour/contrib/xhb/txtline.c rename to contrib/xhb/txtline.c diff --git a/harbour/contrib/xhb/usrrdd.ch b/contrib/xhb/usrrdd.ch similarity index 100% rename from harbour/contrib/xhb/usrrdd.ch rename to contrib/xhb/usrrdd.ch diff --git a/harbour/contrib/xhb/win32prn.ch b/contrib/xhb/win32prn.ch similarity index 100% rename from harbour/contrib/xhb/win32prn.ch rename to contrib/xhb/win32prn.ch diff --git a/harbour/contrib/xhb/wintypes.ch b/contrib/xhb/wintypes.ch similarity index 100% rename from harbour/contrib/xhb/wintypes.ch rename to contrib/xhb/wintypes.ch diff --git a/harbour/contrib/xhb/xcstr.prg b/contrib/xhb/xcstr.prg similarity index 100% rename from harbour/contrib/xhb/xcstr.prg rename to contrib/xhb/xcstr.prg diff --git a/harbour/contrib/xhb/xdbmodst.prg b/contrib/xhb/xdbmodst.prg similarity index 100% rename from harbour/contrib/xhb/xdbmodst.prg rename to contrib/xhb/xdbmodst.prg diff --git a/harbour/contrib/xhb/xhb.ch b/contrib/xhb/xhb.ch similarity index 100% rename from harbour/contrib/xhb/xhb.ch rename to contrib/xhb/xhb.ch diff --git a/harbour/contrib/xhb/xhb.h b/contrib/xhb/xhb.h similarity index 100% rename from harbour/contrib/xhb/xhb.h rename to contrib/xhb/xhb.h diff --git a/harbour/contrib/xhb/xhb.hbc b/contrib/xhb/xhb.hbc similarity index 100% rename from harbour/contrib/xhb/xhb.hbc rename to contrib/xhb/xhb.hbc diff --git a/harbour/contrib/xhb/xhb.hbp b/contrib/xhb/xhb.hbp similarity index 100% rename from harbour/contrib/xhb/xhb.hbp rename to contrib/xhb/xhb.hbp diff --git a/harbour/contrib/xhb/xhb.hbx b/contrib/xhb/xhb.hbx similarity index 100% rename from harbour/contrib/xhb/xhb.hbx rename to contrib/xhb/xhb.hbx diff --git a/harbour/contrib/xhb/xhbarr.c b/contrib/xhb/xhbarr.c similarity index 100% rename from harbour/contrib/xhb/xhbarr.c rename to contrib/xhb/xhbarr.c diff --git a/harbour/contrib/xhb/xhbarrex.c b/contrib/xhb/xhbarrex.c similarity index 100% rename from harbour/contrib/xhb/xhbarrex.c rename to contrib/xhb/xhbarrex.c diff --git a/harbour/contrib/xhb/xhbat.c b/contrib/xhb/xhbat.c similarity index 100% rename from harbour/contrib/xhb/xhbat.c rename to contrib/xhb/xhbat.c diff --git a/harbour/contrib/xhb/xhbcls.ch b/contrib/xhb/xhbcls.ch similarity index 100% rename from harbour/contrib/xhb/xhbcls.ch rename to contrib/xhb/xhbcls.ch diff --git a/harbour/contrib/xhb/xhbcomp.prg b/contrib/xhb/xhbcomp.prg similarity index 100% rename from harbour/contrib/xhb/xhbcomp.prg rename to contrib/xhb/xhbcomp.prg diff --git a/harbour/contrib/xhb/xhbcopyf.c b/contrib/xhb/xhbcopyf.c similarity index 100% rename from harbour/contrib/xhb/xhbcopyf.c rename to contrib/xhb/xhbcopyf.c diff --git a/harbour/contrib/xhb/xhbctbit.c b/contrib/xhb/xhbctbit.c similarity index 100% rename from harbour/contrib/xhb/xhbctbit.c rename to contrib/xhb/xhbctbit.c diff --git a/harbour/contrib/xhb/xhbdate.c b/contrib/xhb/xhbdate.c similarity index 100% rename from harbour/contrib/xhb/xhbdate.c rename to contrib/xhb/xhbdate.c diff --git a/harbour/contrib/xhb/xhbdepr.prg b/contrib/xhb/xhbdepr.prg similarity index 100% rename from harbour/contrib/xhb/xhbdepr.prg rename to contrib/xhb/xhbdepr.prg diff --git a/harbour/contrib/xhb/xhbenum.c b/contrib/xhb/xhbenum.c similarity index 100% rename from harbour/contrib/xhb/xhbenum.c rename to contrib/xhb/xhbenum.c diff --git a/harbour/contrib/xhb/xhberr.prg b/contrib/xhb/xhberr.prg similarity index 100% rename from harbour/contrib/xhb/xhberr.prg rename to contrib/xhb/xhberr.prg diff --git a/harbour/contrib/xhb/xhberrc.c b/contrib/xhb/xhberrc.c similarity index 100% rename from harbour/contrib/xhb/xhberrc.c rename to contrib/xhb/xhberrc.c diff --git a/harbour/contrib/xhb/xhbfs.c b/contrib/xhb/xhbfs.c similarity index 100% rename from harbour/contrib/xhb/xhbfs.c rename to contrib/xhb/xhbfs.c diff --git a/harbour/contrib/xhb/xhbfunc.c b/contrib/xhb/xhbfunc.c similarity index 100% rename from harbour/contrib/xhb/xhbfunc.c rename to contrib/xhb/xhbfunc.c diff --git a/harbour/contrib/xhb/xhbfunp.prg b/contrib/xhb/xhbfunp.prg similarity index 100% rename from harbour/contrib/xhb/xhbfunp.prg rename to contrib/xhb/xhbfunp.prg diff --git a/harbour/contrib/xhb/xhbgt.c b/contrib/xhb/xhbgt.c similarity index 100% rename from harbour/contrib/xhb/xhbgt.c rename to contrib/xhb/xhbgt.c diff --git a/harbour/contrib/xhb/xhbhash.c b/contrib/xhb/xhbhash.c similarity index 100% rename from harbour/contrib/xhb/xhbhash.c rename to contrib/xhb/xhbhash.c diff --git a/harbour/contrib/xhb/xhbhasha.c b/contrib/xhb/xhbhasha.c similarity index 100% rename from harbour/contrib/xhb/xhbhasha.c rename to contrib/xhb/xhbhasha.c diff --git a/harbour/contrib/xhb/xhbhashp.c b/contrib/xhb/xhbhashp.c similarity index 100% rename from harbour/contrib/xhb/xhbhashp.c rename to contrib/xhb/xhbhashp.c diff --git a/harbour/contrib/xhb/xhbi18n.c b/contrib/xhb/xhbi18n.c similarity index 100% rename from harbour/contrib/xhb/xhbi18n.c rename to contrib/xhb/xhbi18n.c diff --git a/harbour/contrib/xhb/xhbinet.c b/contrib/xhb/xhbinet.c similarity index 100% rename from harbour/contrib/xhb/xhbinet.c rename to contrib/xhb/xhbinet.c diff --git a/harbour/contrib/xhb/xhbini.c b/contrib/xhb/xhbini.c similarity index 100% rename from harbour/contrib/xhb/xhbini.c rename to contrib/xhb/xhbini.c diff --git a/harbour/contrib/xhb/xhbinkey.prg b/contrib/xhb/xhbinkey.prg similarity index 100% rename from harbour/contrib/xhb/xhbinkey.prg rename to contrib/xhb/xhbinkey.prg diff --git a/harbour/contrib/xhb/xhbis.c b/contrib/xhb/xhbis.c similarity index 100% rename from harbour/contrib/xhb/xhbis.c rename to contrib/xhb/xhbis.c diff --git a/harbour/contrib/xhb/xhbmemo.prg b/contrib/xhb/xhbmemo.prg similarity index 100% rename from harbour/contrib/xhb/xhbmemo.prg rename to contrib/xhb/xhbmemo.prg diff --git a/harbour/contrib/xhb/xhbmisc.prg b/contrib/xhb/xhbmisc.prg similarity index 100% rename from harbour/contrib/xhb/xhbmisc.prg rename to contrib/xhb/xhbmisc.prg diff --git a/harbour/contrib/xhb/xhbmsgs.c b/contrib/xhb/xhbmsgs.c similarity index 100% rename from harbour/contrib/xhb/xhbmsgs.c rename to contrib/xhb/xhbmsgs.c diff --git a/harbour/contrib/xhb/xhbmt.prg b/contrib/xhb/xhbmt.prg similarity index 100% rename from harbour/contrib/xhb/xhbmt.prg rename to contrib/xhb/xhbmt.prg diff --git a/harbour/contrib/xhb/xhbmtc.c b/contrib/xhb/xhbmtc.c similarity index 100% rename from harbour/contrib/xhb/xhbmtc.c rename to contrib/xhb/xhbmtc.c diff --git a/harbour/contrib/xhb/xhbmvinf.c b/contrib/xhb/xhbmvinf.c similarity index 100% rename from harbour/contrib/xhb/xhbmvinf.c rename to contrib/xhb/xhbmvinf.c diff --git a/harbour/contrib/xhb/xhbole.prg b/contrib/xhb/xhbole.prg similarity index 100% rename from harbour/contrib/xhb/xhbole.prg rename to contrib/xhb/xhbole.prg diff --git a/harbour/contrib/xhb/xhbolec.c b/contrib/xhb/xhbolec.c similarity index 100% rename from harbour/contrib/xhb/xhbolec.c rename to contrib/xhb/xhbolec.c diff --git a/harbour/contrib/xhb/xhbprn.c b/contrib/xhb/xhbprn.c similarity index 100% rename from harbour/contrib/xhb/xhbprn.c rename to contrib/xhb/xhbprn.c diff --git a/harbour/contrib/xhb/xhbproc.c b/contrib/xhb/xhbproc.c similarity index 100% rename from harbour/contrib/xhb/xhbproc.c rename to contrib/xhb/xhbproc.c diff --git a/harbour/contrib/xhb/xhbqself.c b/contrib/xhb/xhbqself.c similarity index 100% rename from harbour/contrib/xhb/xhbqself.c rename to contrib/xhb/xhbqself.c diff --git a/harbour/contrib/xhb/xhbregx.c b/contrib/xhb/xhbregx.c similarity index 100% rename from harbour/contrib/xhb/xhbregx.c rename to contrib/xhb/xhbregx.c diff --git a/harbour/contrib/xhb/xhbsave.c b/contrib/xhb/xhbsave.c similarity index 100% rename from harbour/contrib/xhb/xhbsave.c rename to contrib/xhb/xhbsave.c diff --git a/harbour/contrib/xhb/xhbscr.c b/contrib/xhb/xhbscr.c similarity index 100% rename from harbour/contrib/xhb/xhbscr.c rename to contrib/xhb/xhbscr.c diff --git a/harbour/contrib/xhb/xhbtedit.prg b/contrib/xhb/xhbtedit.prg similarity index 100% rename from harbour/contrib/xhb/xhbtedit.prg rename to contrib/xhb/xhbtedit.prg diff --git a/harbour/contrib/xhb/xhbtrim.c b/contrib/xhb/xhbtrim.c similarity index 100% rename from harbour/contrib/xhb/xhbtrim.c rename to contrib/xhb/xhbtrim.c diff --git a/harbour/contrib/xhb/xhbver.ch b/contrib/xhb/xhbver.ch similarity index 100% rename from harbour/contrib/xhb/xhbver.ch rename to contrib/xhb/xhbver.ch diff --git a/harbour/contrib/xhb/xhbver.prg b/contrib/xhb/xhbver.prg similarity index 100% rename from harbour/contrib/xhb/xhbver.prg rename to contrib/xhb/xhbver.prg diff --git a/harbour/contrib/xhb/xhbwin.c b/contrib/xhb/xhbwin.c similarity index 100% rename from harbour/contrib/xhb/xhbwin.c rename to contrib/xhb/xhbwin.c diff --git a/harbour/contrib/xhb/xhbwith.c b/contrib/xhb/xhbwith.c similarity index 100% rename from harbour/contrib/xhb/xhbwith.c rename to contrib/xhb/xhbwith.c diff --git a/harbour/contrib/xhb/xhwinprn.prg b/contrib/xhb/xhwinprn.prg similarity index 100% rename from harbour/contrib/xhb/xhwinprn.prg rename to contrib/xhb/xhwinprn.prg diff --git a/harbour/contrib/xhb/xstrdel.c b/contrib/xhb/xstrdel.c similarity index 100% rename from harbour/contrib/xhb/xstrdel.c rename to contrib/xhb/xstrdel.c diff --git a/harbour/contrib/xhb/xthrow.c b/contrib/xhb/xthrow.c similarity index 100% rename from harbour/contrib/xhb/xthrow.c rename to contrib/xhb/xthrow.c diff --git a/harbour/contrib/xhb/xwin_reg.c b/contrib/xhb/xwin_reg.c similarity index 100% rename from harbour/contrib/xhb/xwin_reg.c rename to contrib/xhb/xwin_reg.c diff --git a/harbour/contrib/xhb/xwin_ver.c b/contrib/xhb/xwin_ver.c similarity index 100% rename from harbour/contrib/xhb/xwin_ver.c rename to contrib/xhb/xwin_ver.c diff --git a/harbour/debian/changelog b/debian/changelog similarity index 100% rename from harbour/debian/changelog rename to debian/changelog diff --git a/harbour/debian/compat b/debian/compat similarity index 100% rename from harbour/debian/compat rename to debian/compat diff --git a/harbour/debian/control b/debian/control similarity index 100% rename from harbour/debian/control rename to debian/control diff --git a/harbour/debian/copyright b/debian/copyright similarity index 100% rename from harbour/debian/copyright rename to debian/copyright diff --git a/harbour/debian/dirs b/debian/dirs similarity index 100% rename from harbour/debian/dirs rename to debian/dirs diff --git a/harbour/debian/postinst b/debian/postinst similarity index 100% rename from harbour/debian/postinst rename to debian/postinst diff --git a/harbour/debian/postrm b/debian/postrm similarity index 100% rename from harbour/debian/postrm rename to debian/postrm diff --git a/harbour/debian/rules b/debian/rules similarity index 100% rename from harbour/debian/rules rename to debian/rules diff --git a/harbour/doc/Makefile b/doc/Makefile similarity index 100% rename from harbour/doc/Makefile rename to doc/Makefile diff --git a/harbour/doc/c_std.txt b/doc/c_std.txt similarity index 100% rename from harbour/doc/c_std.txt rename to doc/c_std.txt diff --git a/harbour/doc/class_tp.txt b/doc/class_tp.txt similarity index 100% rename from harbour/doc/class_tp.txt rename to doc/class_tp.txt diff --git a/harbour/doc/clipper.txt b/doc/clipper.txt similarity index 100% rename from harbour/doc/clipper.txt rename to doc/clipper.txt diff --git a/harbour/doc/cmdline.txt b/doc/cmdline.txt similarity index 100% rename from harbour/doc/cmdline.txt rename to doc/cmdline.txt diff --git a/harbour/doc/cmpopt.txt b/doc/cmpopt.txt similarity index 100% rename from harbour/doc/cmpopt.txt rename to doc/cmpopt.txt diff --git a/harbour/doc/codebloc.txt b/doc/codebloc.txt similarity index 100% rename from harbour/doc/codebloc.txt rename to doc/codebloc.txt diff --git a/harbour/doc/codestyl.txt b/doc/codestyl.txt similarity index 100% rename from harbour/doc/codestyl.txt rename to doc/codestyl.txt diff --git a/harbour/doc/destruct.txt b/doc/destruct.txt similarity index 100% rename from harbour/doc/destruct.txt rename to doc/destruct.txt diff --git a/harbour/doc/dirstruc.txt b/doc/dirstruc.txt similarity index 100% rename from harbour/doc/dirstruc.txt rename to doc/dirstruc.txt diff --git a/harbour/doc/en/1stread.txt b/doc/en/1stread.txt similarity index 100% rename from harbour/doc/en/1stread.txt rename to doc/en/1stread.txt diff --git a/harbour/doc/en/array.txt b/doc/en/array.txt similarity index 100% rename from harbour/doc/en/array.txt rename to doc/en/array.txt diff --git a/harbour/doc/en/binnum.txt b/doc/en/binnum.txt similarity index 100% rename from harbour/doc/en/binnum.txt rename to doc/en/binnum.txt diff --git a/harbour/doc/en/browse.txt b/doc/en/browse.txt similarity index 100% rename from harbour/doc/en/browse.txt rename to doc/en/browse.txt diff --git a/harbour/doc/en/command.txt b/doc/en/command.txt similarity index 100% rename from harbour/doc/en/command.txt rename to doc/en/command.txt diff --git a/harbour/doc/en/compiler.txt b/doc/en/compiler.txt similarity index 100% rename from harbour/doc/en/compiler.txt rename to doc/en/compiler.txt diff --git a/harbour/doc/en/datetime.txt b/doc/en/datetime.txt similarity index 100% rename from harbour/doc/en/datetime.txt rename to doc/en/datetime.txt diff --git a/harbour/doc/en/dbdelim.txt b/doc/en/dbdelim.txt similarity index 100% rename from harbour/doc/en/dbdelim.txt rename to doc/en/dbdelim.txt diff --git a/harbour/doc/en/dbsdf.txt b/doc/en/dbsdf.txt similarity index 100% rename from harbour/doc/en/dbsdf.txt rename to doc/en/dbsdf.txt diff --git a/harbour/doc/en/dbstrux.txt b/doc/en/dbstrux.txt similarity index 100% rename from harbour/doc/en/dbstrux.txt rename to doc/en/dbstrux.txt diff --git a/harbour/doc/en/dir.txt b/doc/en/dir.txt similarity index 100% rename from harbour/doc/en/dir.txt rename to doc/en/dir.txt diff --git a/harbour/doc/en/diskspac.txt b/doc/en/diskspac.txt similarity index 100% rename from harbour/doc/en/diskspac.txt rename to doc/en/diskspac.txt diff --git a/harbour/doc/en/errsys.txt b/doc/en/errsys.txt similarity index 100% rename from harbour/doc/en/errsys.txt rename to doc/en/errsys.txt diff --git a/harbour/doc/en/eval.txt b/doc/en/eval.txt similarity index 100% rename from harbour/doc/en/eval.txt rename to doc/en/eval.txt diff --git a/harbour/doc/en/file.txt b/doc/en/file.txt similarity index 100% rename from harbour/doc/en/file.txt rename to doc/en/file.txt diff --git a/harbour/doc/en/garbage.txt b/doc/en/garbage.txt similarity index 100% rename from harbour/doc/en/garbage.txt rename to doc/en/garbage.txt diff --git a/harbour/doc/en/harbext.txt b/doc/en/harbext.txt similarity index 100% rename from harbour/doc/en/harbext.txt rename to doc/en/harbext.txt diff --git a/harbour/doc/en/hashes.txt b/doc/en/hashes.txt similarity index 100% rename from harbour/doc/en/hashes.txt rename to doc/en/hashes.txt diff --git a/harbour/doc/en/hb_set.txt b/doc/en/hb_set.txt similarity index 100% rename from harbour/doc/en/hb_set.txt rename to doc/en/hb_set.txt diff --git a/harbour/doc/en/hbflock.txt b/doc/en/hbflock.txt similarity index 100% rename from harbour/doc/en/hbflock.txt rename to doc/en/hbflock.txt diff --git a/harbour/doc/en/hbinet.txt b/doc/en/hbinet.txt similarity index 100% rename from harbour/doc/en/hbinet.txt rename to doc/en/hbinet.txt diff --git a/harbour/doc/en/hvm.txt b/doc/en/hvm.txt similarity index 100% rename from harbour/doc/en/hvm.txt rename to doc/en/hvm.txt diff --git a/harbour/doc/en/idle.txt b/doc/en/idle.txt similarity index 100% rename from harbour/doc/en/idle.txt rename to doc/en/idle.txt diff --git a/harbour/doc/en/input.txt b/doc/en/input.txt similarity index 100% rename from harbour/doc/en/input.txt rename to doc/en/input.txt diff --git a/harbour/doc/en/lang.txt b/doc/en/lang.txt similarity index 100% rename from harbour/doc/en/lang.txt rename to doc/en/lang.txt diff --git a/harbour/doc/en/macro.txt b/doc/en/macro.txt similarity index 100% rename from harbour/doc/en/macro.txt rename to doc/en/macro.txt diff --git a/harbour/doc/en/math.txt b/doc/en/math.txt similarity index 100% rename from harbour/doc/en/math.txt rename to doc/en/math.txt diff --git a/harbour/doc/en/memo.txt b/doc/en/memo.txt similarity index 100% rename from harbour/doc/en/memo.txt rename to doc/en/memo.txt diff --git a/harbour/doc/en/memvar.txt b/doc/en/memvar.txt similarity index 100% rename from harbour/doc/en/memvar.txt rename to doc/en/memvar.txt diff --git a/harbour/doc/en/menu.txt b/doc/en/menu.txt similarity index 100% rename from harbour/doc/en/menu.txt rename to doc/en/menu.txt diff --git a/harbour/doc/en/misc.txt b/doc/en/misc.txt similarity index 100% rename from harbour/doc/en/misc.txt rename to doc/en/misc.txt diff --git a/harbour/doc/en/nation.txt b/doc/en/nation.txt similarity index 100% rename from harbour/doc/en/nation.txt rename to doc/en/nation.txt diff --git a/harbour/doc/en/objfunc.txt b/doc/en/objfunc.txt similarity index 100% rename from harbour/doc/en/objfunc.txt rename to doc/en/objfunc.txt diff --git a/harbour/doc/en/rdd.txt b/doc/en/rdd.txt similarity index 100% rename from harbour/doc/en/rdd.txt rename to doc/en/rdd.txt diff --git a/harbour/doc/en/rdddb.txt b/doc/en/rdddb.txt similarity index 100% rename from harbour/doc/en/rdddb.txt rename to doc/en/rdddb.txt diff --git a/harbour/doc/en/rddmisc.txt b/doc/en/rddmisc.txt similarity index 100% rename from harbour/doc/en/rddmisc.txt rename to doc/en/rddmisc.txt diff --git a/harbour/doc/en/rddord.txt b/doc/en/rddord.txt similarity index 100% rename from harbour/doc/en/rddord.txt rename to doc/en/rddord.txt diff --git a/harbour/doc/en/sayget.txt b/doc/en/sayget.txt similarity index 100% rename from harbour/doc/en/sayget.txt rename to doc/en/sayget.txt diff --git a/harbour/doc/en/set.txt b/doc/en/set.txt similarity index 100% rename from harbour/doc/en/set.txt rename to doc/en/set.txt diff --git a/harbour/doc/en/setmode.txt b/doc/en/setmode.txt similarity index 100% rename from harbour/doc/en/setmode.txt rename to doc/en/setmode.txt diff --git a/harbour/doc/en/string.txt b/doc/en/string.txt similarity index 100% rename from harbour/doc/en/string.txt rename to doc/en/string.txt diff --git a/harbour/doc/en/strotype.txt b/doc/en/strotype.txt similarity index 100% rename from harbour/doc/en/strotype.txt rename to doc/en/strotype.txt diff --git a/harbour/doc/en/subcodes.txt b/doc/en/subcodes.txt similarity index 100% rename from harbour/doc/en/subcodes.txt rename to doc/en/subcodes.txt diff --git a/harbour/doc/en/tbrowse.txt b/doc/en/tbrowse.txt similarity index 100% rename from harbour/doc/en/tbrowse.txt rename to doc/en/tbrowse.txt diff --git a/harbour/doc/en/tclass.txt b/doc/en/tclass.txt similarity index 100% rename from harbour/doc/en/tclass.txt rename to doc/en/tclass.txt diff --git a/harbour/doc/en/terminal.txt b/doc/en/terminal.txt similarity index 100% rename from harbour/doc/en/terminal.txt rename to doc/en/terminal.txt diff --git a/harbour/doc/en/tgetlist.txt b/doc/en/tgetlist.txt similarity index 100% rename from harbour/doc/en/tgetlist.txt rename to doc/en/tgetlist.txt diff --git a/harbour/doc/en/tlabel.txt b/doc/en/tlabel.txt similarity index 100% rename from harbour/doc/en/tlabel.txt rename to doc/en/tlabel.txt diff --git a/harbour/doc/en/treport.txt b/doc/en/treport.txt similarity index 100% rename from harbour/doc/en/treport.txt rename to doc/en/treport.txt diff --git a/harbour/doc/en/var.txt b/doc/en/var.txt similarity index 100% rename from harbour/doc/en/var.txt rename to doc/en/var.txt diff --git a/harbour/doc/gmake.txt b/doc/gmake.txt similarity index 100% rename from harbour/doc/gmake.txt rename to doc/gmake.txt diff --git a/harbour/doc/gtapi.txt b/doc/gtapi.txt similarity index 100% rename from harbour/doc/gtapi.txt rename to doc/gtapi.txt diff --git a/harbour/doc/gtslang.txt b/doc/gtslang.txt similarity index 100% rename from harbour/doc/gtslang.txt rename to doc/gtslang.txt diff --git a/harbour/doc/hdr_tpl.txt b/doc/hdr_tpl.txt similarity index 100% rename from harbour/doc/hdr_tpl.txt rename to doc/hdr_tpl.txt diff --git a/harbour/doc/howtorel.txt b/doc/howtorel.txt similarity index 100% rename from harbour/doc/howtorel.txt rename to doc/howtorel.txt diff --git a/harbour/doc/howtorep.txt b/doc/howtorep.txt similarity index 100% rename from harbour/doc/howtorep.txt rename to doc/howtorep.txt diff --git a/harbour/doc/locks.txt b/doc/locks.txt similarity index 100% rename from harbour/doc/locks.txt rename to doc/locks.txt diff --git a/harbour/doc/oldnews.txt b/doc/oldnews.txt similarity index 100% rename from harbour/doc/oldnews.txt rename to doc/oldnews.txt diff --git a/harbour/doc/pcode.txt b/doc/pcode.txt similarity index 100% rename from harbour/doc/pcode.txt rename to doc/pcode.txt diff --git a/harbour/doc/pp.txt b/doc/pp.txt similarity index 100% rename from harbour/doc/pp.txt rename to doc/pp.txt diff --git a/harbour/doc/pragma.txt b/doc/pragma.txt similarity index 100% rename from harbour/doc/pragma.txt rename to doc/pragma.txt diff --git a/harbour/doc/statics.txt b/doc/statics.txt similarity index 100% rename from harbour/doc/statics.txt rename to doc/statics.txt diff --git a/harbour/doc/todo.txt b/doc/todo.txt similarity index 100% rename from harbour/doc/todo.txt rename to doc/todo.txt diff --git a/harbour/doc/tracing.txt b/doc/tracing.txt similarity index 100% rename from harbour/doc/tracing.txt rename to doc/tracing.txt diff --git a/harbour/doc/transfrm.txt b/doc/transfrm.txt similarity index 100% rename from harbour/doc/transfrm.txt rename to doc/transfrm.txt diff --git a/harbour/doc/vm.txt b/doc/vm.txt similarity index 100% rename from harbour/doc/vm.txt rename to doc/vm.txt diff --git a/harbour/doc/windll.txt b/doc/windll.txt similarity index 100% rename from harbour/doc/windll.txt rename to doc/windll.txt diff --git a/harbour/doc/xhb-diff.txt b/doc/xhb-diff.txt similarity index 100% rename from harbour/doc/xhb-diff.txt rename to doc/xhb-diff.txt diff --git a/harbour/dos-make.exe b/dos-make.exe similarity index 100% rename from harbour/dos-make.exe rename to dos-make.exe diff --git a/harbour/extras/dbu/dbu.hbp b/extras/dbu/dbu.hbp similarity index 100% rename from harbour/extras/dbu/dbu.hbp rename to extras/dbu/dbu.hbp diff --git a/harbour/extras/dbu/dbu52.dif b/extras/dbu/dbu52.dif similarity index 100% rename from harbour/extras/dbu/dbu52.dif rename to extras/dbu/dbu52.dif diff --git a/harbour/extras/dbu/dbu53.dif b/extras/dbu/dbu53.dif similarity index 100% rename from harbour/extras/dbu/dbu53.dif rename to extras/dbu/dbu53.dif diff --git a/harbour/extras/dbu/readme.txt b/extras/dbu/readme.txt similarity index 100% rename from harbour/extras/dbu/readme.txt rename to extras/dbu/readme.txt diff --git a/harbour/extras/gfspell/gfspell.hbc b/extras/gfspell/gfspell.hbc similarity index 100% rename from harbour/extras/gfspell/gfspell.hbc rename to extras/gfspell/gfspell.hbc diff --git a/harbour/extras/gfspell/gfspell.hbp b/extras/gfspell/gfspell.hbp similarity index 100% rename from harbour/extras/gfspell/gfspell.hbp rename to extras/gfspell/gfspell.hbp diff --git a/harbour/extras/gfspell/gfspell.hbx b/extras/gfspell/gfspell.hbx similarity index 100% rename from harbour/extras/gfspell/gfspell.hbx rename to extras/gfspell/gfspell.hbx diff --git a/harbour/extras/gfspell/readme.txt b/extras/gfspell/readme.txt similarity index 100% rename from harbour/extras/gfspell/readme.txt rename to extras/gfspell/readme.txt diff --git a/harbour/extras/gfspell/spell.ch b/extras/gfspell/spell.ch similarity index 100% rename from harbour/extras/gfspell/spell.ch rename to extras/gfspell/spell.ch diff --git a/harbour/extras/gfspell/spell.ng b/extras/gfspell/spell.ng similarity index 100% rename from harbour/extras/gfspell/spell.ng rename to extras/gfspell/spell.ng diff --git a/harbour/extras/gfspell/spell.prg b/extras/gfspell/spell.prg similarity index 100% rename from harbour/extras/gfspell/spell.prg rename to extras/gfspell/spell.prg diff --git a/harbour/extras/gfspell/spellc.c b/extras/gfspell/spellc.c similarity index 100% rename from harbour/extras/gfspell/spellc.c rename to extras/gfspell/spellc.c diff --git a/harbour/extras/gfspell/words.dbf b/extras/gfspell/words.dbf similarity index 100% rename from harbour/extras/gfspell/words.dbf rename to extras/gfspell/words.dbf diff --git a/harbour/extras/gtwvw/docs/funclist.txt b/extras/gtwvw/docs/funclist.txt similarity index 100% rename from harbour/extras/gtwvw/docs/funclist.txt rename to extras/gtwvw/docs/funclist.txt diff --git a/harbour/extras/gtwvw/docs/gtwvw.txt b/extras/gtwvw/docs/gtwvw.txt similarity index 100% rename from harbour/extras/gtwvw/docs/gtwvw.txt rename to extras/gtwvw/docs/gtwvw.txt diff --git a/harbour/extras/gtwvw/docs/whatsnew.txt b/extras/gtwvw/docs/whatsnew.txt similarity index 100% rename from harbour/extras/gtwvw/docs/whatsnew.txt rename to extras/gtwvw/docs/whatsnew.txt diff --git a/harbour/extras/gtwvw/gtwvw.hbc b/extras/gtwvw/gtwvw.hbc similarity index 100% rename from harbour/extras/gtwvw/gtwvw.hbc rename to extras/gtwvw/gtwvw.hbc diff --git a/harbour/extras/gtwvw/gtwvw.hbp b/extras/gtwvw/gtwvw.hbp similarity index 100% rename from harbour/extras/gtwvw/gtwvw.hbp rename to extras/gtwvw/gtwvw.hbp diff --git a/harbour/extras/gtwvw/gtwvw.hbx b/extras/gtwvw/gtwvw.hbx similarity index 100% rename from harbour/extras/gtwvw/gtwvw.hbx rename to extras/gtwvw/gtwvw.hbx diff --git a/harbour/extras/gtwvw/gtwvwd.c b/extras/gtwvw/gtwvwd.c similarity index 100% rename from harbour/extras/gtwvw/gtwvwd.c rename to extras/gtwvw/gtwvwd.c diff --git a/harbour/extras/gtwvw/hbgtwvw.h b/extras/gtwvw/hbgtwvw.h similarity index 100% rename from harbour/extras/gtwvw/hbgtwvw.h rename to extras/gtwvw/hbgtwvw.h diff --git a/harbour/extras/gtwvw/hbole.h b/extras/gtwvw/hbole.h similarity index 100% rename from harbour/extras/gtwvw/hbole.h rename to extras/gtwvw/hbole.h diff --git a/harbour/extras/gtwvw/tests/_wvwmous.prg b/extras/gtwvw/tests/_wvwmous.prg similarity index 100% rename from harbour/extras/gtwvw/tests/_wvwmous.prg rename to extras/gtwvw/tests/_wvwmous.prg diff --git a/harbour/extras/gtwvw/tests/cbtest1.prg b/extras/gtwvw/tests/cbtest1.prg similarity index 100% rename from harbour/extras/gtwvw/tests/cbtest1.prg rename to extras/gtwvw/tests/cbtest1.prg diff --git a/harbour/extras/gtwvw/tests/cbtest6.prg b/extras/gtwvw/tests/cbtest6.prg similarity index 100% rename from harbour/extras/gtwvw/tests/cbtest6.prg rename to extras/gtwvw/tests/cbtest6.prg diff --git a/harbour/extras/gtwvw/tests/def2.bmp b/extras/gtwvw/tests/def2.bmp similarity index 100% rename from harbour/extras/gtwvw/tests/def2.bmp rename to extras/gtwvw/tests/def2.bmp diff --git a/harbour/extras/gtwvw/tests/dia_excl.ico b/extras/gtwvw/tests/dia_excl.ico similarity index 100% rename from harbour/extras/gtwvw/tests/dia_excl.ico rename to extras/gtwvw/tests/dia_excl.ico diff --git a/harbour/extras/gtwvw/tests/drawimg.prg b/extras/gtwvw/tests/drawimg.prg similarity index 100% rename from harbour/extras/gtwvw/tests/drawimg.prg rename to extras/gtwvw/tests/drawimg.prg diff --git a/harbour/extras/gtwvw/tests/ebtest7.prg b/extras/gtwvw/tests/ebtest7.prg similarity index 100% rename from harbour/extras/gtwvw/tests/ebtest7.prg rename to extras/gtwvw/tests/ebtest7.prg diff --git a/harbour/extras/gtwvw/tests/hbmk.hbm b/extras/gtwvw/tests/hbmk.hbm similarity index 100% rename from harbour/extras/gtwvw/tests/hbmk.hbm rename to extras/gtwvw/tests/hbmk.hbm diff --git a/harbour/extras/gtwvw/tests/inpfocus.prg b/extras/gtwvw/tests/inpfocus.prg similarity index 100% rename from harbour/extras/gtwvw/tests/inpfocus.prg rename to extras/gtwvw/tests/inpfocus.prg diff --git a/harbour/extras/gtwvw/tests/maincoor.prg b/extras/gtwvw/tests/maincoor.prg similarity index 100% rename from harbour/extras/gtwvw/tests/maincoor.prg rename to extras/gtwvw/tests/maincoor.prg diff --git a/harbour/extras/gtwvw/tests/maximize.prg b/extras/gtwvw/tests/maximize.prg similarity index 100% rename from harbour/extras/gtwvw/tests/maximize.prg rename to extras/gtwvw/tests/maximize.prg diff --git a/harbour/extras/gtwvw/tests/prog0.prg b/extras/gtwvw/tests/prog0.prg similarity index 100% rename from harbour/extras/gtwvw/tests/prog0.prg rename to extras/gtwvw/tests/prog0.prg diff --git a/harbour/extras/gtwvw/tests/prog1.prg b/extras/gtwvw/tests/prog1.prg similarity index 100% rename from harbour/extras/gtwvw/tests/prog1.prg rename to extras/gtwvw/tests/prog1.prg diff --git a/harbour/extras/gtwvw/tests/prog2.prg b/extras/gtwvw/tests/prog2.prg similarity index 100% rename from harbour/extras/gtwvw/tests/prog2.prg rename to extras/gtwvw/tests/prog2.prg diff --git a/harbour/extras/gtwvw/tests/readme.txt b/extras/gtwvw/tests/readme.txt similarity index 100% rename from harbour/extras/gtwvw/tests/readme.txt rename to extras/gtwvw/tests/readme.txt diff --git a/harbour/extras/gtwvw/tests/vouch1.bmp b/extras/gtwvw/tests/vouch1.bmp similarity index 100% rename from harbour/extras/gtwvw/tests/vouch1.bmp rename to extras/gtwvw/tests/vouch1.bmp diff --git a/harbour/extras/gtwvw/tests/vouch1.gif b/extras/gtwvw/tests/vouch1.gif similarity index 100% rename from harbour/extras/gtwvw/tests/vouch1.gif rename to extras/gtwvw/tests/vouch1.gif diff --git a/harbour/extras/gtwvw/tests/wvwtest9.prg b/extras/gtwvw/tests/wvwtest9.prg similarity index 100% rename from harbour/extras/gtwvw/tests/wvwtest9.prg rename to extras/gtwvw/tests/wvwtest9.prg diff --git a/harbour/extras/gtwvw/wvt2wvw.ch b/extras/gtwvw/wvt2wvw.ch similarity index 100% rename from harbour/extras/gtwvw/wvt2wvw.ch rename to extras/gtwvw/wvt2wvw.ch diff --git a/harbour/extras/gtwvw/wvwcheck.c b/extras/gtwvw/wvwcheck.c similarity index 100% rename from harbour/extras/gtwvw/wvwcheck.c rename to extras/gtwvw/wvwcheck.c diff --git a/harbour/extras/gtwvw/wvwdraw.c b/extras/gtwvw/wvwdraw.c similarity index 100% rename from harbour/extras/gtwvw/wvwdraw.c rename to extras/gtwvw/wvwdraw.c diff --git a/harbour/extras/gtwvw/wvwedit.c b/extras/gtwvw/wvwedit.c similarity index 100% rename from harbour/extras/gtwvw/wvwedit.c rename to extras/gtwvw/wvwedit.c diff --git a/harbour/extras/gtwvw/wvwfuncs.c b/extras/gtwvw/wvwfuncs.c similarity index 100% rename from harbour/extras/gtwvw/wvwfuncs.c rename to extras/gtwvw/wvwfuncs.c diff --git a/harbour/extras/gtwvw/wvwmenu.c b/extras/gtwvw/wvwmenu.c similarity index 100% rename from harbour/extras/gtwvw/wvwmenu.c rename to extras/gtwvw/wvwmenu.c diff --git a/harbour/extras/gtwvw/wvwpush.c b/extras/gtwvw/wvwpush.c similarity index 100% rename from harbour/extras/gtwvw/wvwpush.c rename to extras/gtwvw/wvwpush.c diff --git a/harbour/extras/gtwvw/wvwstbar.c b/extras/gtwvw/wvwstbar.c similarity index 100% rename from harbour/extras/gtwvw/wvwstbar.c rename to extras/gtwvw/wvwstbar.c diff --git a/harbour/extras/gtwvw/wvwtbar.c b/extras/gtwvw/wvwtbar.c similarity index 100% rename from harbour/extras/gtwvw/wvwtbar.c rename to extras/gtwvw/wvwtbar.c diff --git a/harbour/extras/guestbk/cgi.ch b/extras/guestbk/cgi.ch similarity index 100% rename from harbour/extras/guestbk/cgi.ch rename to extras/guestbk/cgi.ch diff --git a/harbour/extras/guestbk/cgi.prg b/extras/guestbk/cgi.prg similarity index 100% rename from harbour/extras/guestbk/cgi.prg rename to extras/guestbk/cgi.prg diff --git a/harbour/extras/guestbk/guestbk.hbp b/extras/guestbk/guestbk.hbp similarity index 100% rename from harbour/extras/guestbk/guestbk.hbp rename to extras/guestbk/guestbk.hbp diff --git a/harbour/extras/guestbk/guestbk.htm b/extras/guestbk/guestbk.htm similarity index 100% rename from harbour/extras/guestbk/guestbk.htm rename to extras/guestbk/guestbk.htm diff --git a/harbour/extras/guestbk/guestbk.ini b/extras/guestbk/guestbk.ini similarity index 100% rename from harbour/extras/guestbk/guestbk.ini rename to extras/guestbk/guestbk.ini diff --git a/harbour/extras/guestbk/guestbk.prg b/extras/guestbk/guestbk.prg similarity index 100% rename from harbour/extras/guestbk/guestbk.prg rename to extras/guestbk/guestbk.prg diff --git a/harbour/extras/guestbk/guestbk.txt b/extras/guestbk/guestbk.txt similarity index 100% rename from harbour/extras/guestbk/guestbk.txt rename to extras/guestbk/guestbk.txt diff --git a/harbour/extras/guestbk/inifiles.prg b/extras/guestbk/inifiles.prg similarity index 100% rename from harbour/extras/guestbk/inifiles.prg rename to extras/guestbk/inifiles.prg diff --git a/harbour/extras/hbdoc/genbase.prg b/extras/hbdoc/genbase.prg similarity index 100% rename from harbour/extras/hbdoc/genbase.prg rename to extras/hbdoc/genbase.prg diff --git a/harbour/extras/hbdoc/genhtml.prg b/extras/hbdoc/genhtml.prg similarity index 100% rename from harbour/extras/hbdoc/genhtml.prg rename to extras/hbdoc/genhtml.prg diff --git a/harbour/extras/hbdoc/gentxt.prg b/extras/hbdoc/gentxt.prg similarity index 100% rename from harbour/extras/hbdoc/gentxt.prg rename to extras/hbdoc/gentxt.prg diff --git a/harbour/extras/hbdoc/genxml.prg b/extras/hbdoc/genxml.prg similarity index 100% rename from harbour/extras/hbdoc/genxml.prg rename to extras/hbdoc/genxml.prg diff --git a/harbour/extras/hbdoc/hbdoc.ch b/extras/hbdoc/hbdoc.ch similarity index 100% rename from harbour/extras/hbdoc/hbdoc.ch rename to extras/hbdoc/hbdoc.ch diff --git a/harbour/extras/hbdoc/hbdoc.css b/extras/hbdoc/hbdoc.css similarity index 100% rename from harbour/extras/hbdoc/hbdoc.css rename to extras/hbdoc/hbdoc.css diff --git a/harbour/extras/hbdoc/hbdoc.hbp b/extras/hbdoc/hbdoc.hbp similarity index 100% rename from harbour/extras/hbdoc/hbdoc.hbp rename to extras/hbdoc/hbdoc.hbp diff --git a/harbour/extras/hbdoc/hbdoc.prg b/extras/hbdoc/hbdoc.prg similarity index 100% rename from harbour/extras/hbdoc/hbdoc.prg rename to extras/hbdoc/hbdoc.prg diff --git a/harbour/extras/hbdoc/tmplates.prg b/extras/hbdoc/tmplates.prg similarity index 100% rename from harbour/extras/hbdoc/tmplates.prg rename to extras/hbdoc/tmplates.prg diff --git a/harbour/extras/hbdroid/hbdroid.h b/extras/hbdroid/hbdroid.h similarity index 100% rename from harbour/extras/hbdroid/hbdroid.h rename to extras/hbdroid/hbdroid.h diff --git a/harbour/extras/hbdroid/hbdroid.hbc b/extras/hbdroid/hbdroid.hbc similarity index 100% rename from harbour/extras/hbdroid/hbdroid.hbc rename to extras/hbdroid/hbdroid.hbc diff --git a/harbour/extras/hbdroid/hbdroid.hbp b/extras/hbdroid/hbdroid.hbp similarity index 100% rename from harbour/extras/hbdroid/hbdroid.hbp rename to extras/hbdroid/hbdroid.hbp diff --git a/harbour/extras/hbdroid/hbdroid.hbx b/extras/hbdroid/hbdroid.hbx similarity index 100% rename from harbour/extras/hbdroid/hbdroid.hbx rename to extras/hbdroid/hbdroid.hbx diff --git a/harbour/extras/hbdroid/hvminit.c b/extras/hbdroid/hvminit.c similarity index 100% rename from harbour/extras/hbdroid/hvminit.c rename to extras/hbdroid/hvminit.c diff --git a/harbour/extras/hbdroid/msginfo.c b/extras/hbdroid/msginfo.c similarity index 100% rename from harbour/extras/hbdroid/msginfo.c rename to extras/hbdroid/msginfo.c diff --git a/harbour/extras/hbusb/core.c b/extras/hbusb/core.c similarity index 100% rename from harbour/extras/hbusb/core.c rename to extras/hbusb/core.c diff --git a/harbour/extras/hbusb/hbusb.ch b/extras/hbusb/hbusb.ch similarity index 100% rename from harbour/extras/hbusb/hbusb.ch rename to extras/hbusb/hbusb.ch diff --git a/harbour/extras/hbusb/hbusb.hbc b/extras/hbusb/hbusb.hbc similarity index 100% rename from harbour/extras/hbusb/hbusb.hbc rename to extras/hbusb/hbusb.hbc diff --git a/harbour/extras/hbusb/hbusb.hbp b/extras/hbusb/hbusb.hbp similarity index 100% rename from harbour/extras/hbusb/hbusb.hbp rename to extras/hbusb/hbusb.hbp diff --git a/harbour/extras/hbusb/hbusb.hbx b/extras/hbusb/hbusb.hbx similarity index 100% rename from harbour/extras/hbusb/hbusb.hbx rename to extras/hbusb/hbusb.hbx diff --git a/harbour/extras/hbusb/tests/hbmk.hbm b/extras/hbusb/tests/hbmk.hbm similarity index 100% rename from harbour/extras/hbusb/tests/hbmk.hbm rename to extras/hbusb/tests/hbmk.hbm diff --git a/harbour/extras/hbusb/tests/test.prg b/extras/hbusb/tests/test.prg similarity index 100% rename from harbour/extras/hbusb/tests/test.prg rename to extras/hbusb/tests/test.prg diff --git a/harbour/extras/hbvpdf/core.prg b/extras/hbvpdf/core.prg similarity index 100% rename from harbour/extras/hbvpdf/core.prg rename to extras/hbvpdf/core.prg diff --git a/harbour/extras/hbvpdf/fonts.dat b/extras/hbvpdf/fonts.dat similarity index 100% rename from harbour/extras/hbvpdf/fonts.dat rename to extras/hbvpdf/fonts.dat diff --git a/harbour/extras/hbvpdf/fonts.prg b/extras/hbvpdf/fonts.prg similarity index 100% rename from harbour/extras/hbvpdf/fonts.prg rename to extras/hbvpdf/fonts.prg diff --git a/harbour/extras/hbvpdf/hbvpdf.ch b/extras/hbvpdf/hbvpdf.ch similarity index 100% rename from harbour/extras/hbvpdf/hbvpdf.ch rename to extras/hbvpdf/hbvpdf.ch diff --git a/harbour/extras/hbvpdf/hbvpdf.hbc b/extras/hbvpdf/hbvpdf.hbc similarity index 100% rename from harbour/extras/hbvpdf/hbvpdf.hbc rename to extras/hbvpdf/hbvpdf.hbc diff --git a/harbour/extras/hbvpdf/hbvpdf.hbp b/extras/hbvpdf/hbvpdf.hbp similarity index 100% rename from harbour/extras/hbvpdf/hbvpdf.hbp rename to extras/hbvpdf/hbvpdf.hbp diff --git a/harbour/extras/hbvpdf/hbvpdf.hbx b/extras/hbvpdf/hbvpdf.hbx similarity index 100% rename from harbour/extras/hbvpdf/hbvpdf.hbx rename to extras/hbvpdf/hbvpdf.hbx diff --git a/harbour/extras/hbvpdf/readme.txt b/extras/hbvpdf/readme.txt similarity index 100% rename from harbour/extras/hbvpdf/readme.txt rename to extras/hbvpdf/readme.txt diff --git a/harbour/extras/hbvpdf/tests/files/color.jpg b/extras/hbvpdf/tests/files/color.jpg similarity index 100% rename from harbour/extras/hbvpdf/tests/files/color.jpg rename to extras/hbvpdf/tests/files/color.jpg diff --git a/harbour/extras/hbvpdf/tests/files/color.tif b/extras/hbvpdf/tests/files/color.tif similarity index 100% rename from harbour/extras/hbvpdf/tests/files/color.tif rename to extras/hbvpdf/tests/files/color.tif diff --git a/harbour/extras/hbvpdf/tests/files/test.txt b/extras/hbvpdf/tests/files/test.txt similarity index 100% rename from harbour/extras/hbvpdf/tests/files/test.txt rename to extras/hbvpdf/tests/files/test.txt diff --git a/harbour/extras/hbvpdf/tests/hbmk.hbm b/extras/hbvpdf/tests/hbmk.hbm similarity index 100% rename from harbour/extras/hbvpdf/tests/hbmk.hbm rename to extras/hbvpdf/tests/hbmk.hbm diff --git a/harbour/extras/hbvpdf/tests/pdf_demo.prg b/extras/hbvpdf/tests/pdf_demo.prg similarity index 100% rename from harbour/extras/hbvpdf/tests/pdf_demo.prg rename to extras/hbvpdf/tests/pdf_demo.prg diff --git a/harbour/extras/hbxlsxml/hbxlsxml.hbc b/extras/hbxlsxml/hbxlsxml.hbc similarity index 100% rename from harbour/extras/hbxlsxml/hbxlsxml.hbc rename to extras/hbxlsxml/hbxlsxml.hbc diff --git a/harbour/extras/hbxlsxml/hbxlsxml.hbp b/extras/hbxlsxml/hbxlsxml.hbp similarity index 100% rename from harbour/extras/hbxlsxml/hbxlsxml.hbp rename to extras/hbxlsxml/hbxlsxml.hbp diff --git a/harbour/extras/hbxlsxml/hbxlsxml.hbx b/extras/hbxlsxml/hbxlsxml.hbx similarity index 100% rename from harbour/extras/hbxlsxml/hbxlsxml.hbx rename to extras/hbxlsxml/hbxlsxml.hbx diff --git a/harbour/extras/hbxlsxml/tests/example.prg b/extras/hbxlsxml/tests/example.prg similarity index 100% rename from harbour/extras/hbxlsxml/tests/example.prg rename to extras/hbxlsxml/tests/example.prg diff --git a/harbour/extras/hbxlsxml/tests/example2.prg b/extras/hbxlsxml/tests/example2.prg similarity index 100% rename from harbour/extras/hbxlsxml/tests/example2.prg rename to extras/hbxlsxml/tests/example2.prg diff --git a/harbour/extras/hbxlsxml/tests/example3.prg b/extras/hbxlsxml/tests/example3.prg similarity index 100% rename from harbour/extras/hbxlsxml/tests/example3.prg rename to extras/hbxlsxml/tests/example3.prg diff --git a/harbour/extras/hbxlsxml/tests/hbmk.hbm b/extras/hbxlsxml/tests/hbmk.hbm similarity index 100% rename from harbour/extras/hbxlsxml/tests/hbmk.hbm rename to extras/hbxlsxml/tests/hbmk.hbm diff --git a/harbour/extras/hbxlsxml/xlsxml.prg b/extras/hbxlsxml/xlsxml.prg similarity index 100% rename from harbour/extras/hbxlsxml/xlsxml.prg rename to extras/hbxlsxml/xlsxml.prg diff --git a/harbour/extras/hbxlsxml/xlsxml_s.prg b/extras/hbxlsxml/xlsxml_s.prg similarity index 100% rename from harbour/extras/hbxlsxml/xlsxml_s.prg rename to extras/hbxlsxml/xlsxml_s.prg diff --git a/harbour/extras/hbxlsxml/xlsxml_y.prg b/extras/hbxlsxml/xlsxml_y.prg similarity index 100% rename from harbour/extras/hbxlsxml/xlsxml_y.prg rename to extras/hbxlsxml/xlsxml_y.prg diff --git a/harbour/extras/httpsrv/cgifunc.prg b/extras/httpsrv/cgifunc.prg similarity index 100% rename from harbour/extras/httpsrv/cgifunc.prg rename to extras/httpsrv/cgifunc.prg diff --git a/harbour/extras/httpsrv/cookie.prg b/extras/httpsrv/cookie.prg similarity index 100% rename from harbour/extras/httpsrv/cookie.prg rename to extras/httpsrv/cookie.prg diff --git a/harbour/extras/httpsrv/home/counter.html b/extras/httpsrv/home/counter.html similarity index 100% rename from harbour/extras/httpsrv/home/counter.html rename to extras/httpsrv/home/counter.html diff --git a/harbour/extras/httpsrv/home/css/base.css b/extras/httpsrv/home/css/base.css similarity index 100% rename from harbour/extras/httpsrv/home/css/base.css rename to extras/httpsrv/home/css/base.css diff --git a/harbour/extras/httpsrv/home/favicon.ico b/extras/httpsrv/home/favicon.ico similarity index 100% rename from harbour/extras/httpsrv/home/favicon.ico rename to extras/httpsrv/home/favicon.ico diff --git a/harbour/extras/httpsrv/home/images/ajax-loader.gif b/extras/httpsrv/home/images/ajax-loader.gif similarity index 100% rename from harbour/extras/httpsrv/home/images/ajax-loader.gif rename to extras/httpsrv/home/images/ajax-loader.gif diff --git a/harbour/extras/httpsrv/home/index.html b/extras/httpsrv/home/index.html similarity index 100% rename from harbour/extras/httpsrv/home/index.html rename to extras/httpsrv/home/index.html diff --git a/harbour/extras/httpsrv/home/js/ajax.js b/extras/httpsrv/home/js/ajax.js similarity index 100% rename from harbour/extras/httpsrv/home/js/ajax.js rename to extras/httpsrv/home/js/ajax.js diff --git a/harbour/extras/httpsrv/home/postsample.html b/extras/httpsrv/home/postsample.html similarity index 100% rename from harbour/extras/httpsrv/home/postsample.html rename to extras/httpsrv/home/postsample.html diff --git a/harbour/extras/httpsrv/home/testajax.html b/extras/httpsrv/home/testajax.html similarity index 100% rename from harbour/extras/httpsrv/home/testajax.html rename to extras/httpsrv/home/testajax.html diff --git a/harbour/extras/httpsrv/home/testxmldb.html b/extras/httpsrv/home/testxmldb.html similarity index 100% rename from harbour/extras/httpsrv/home/testxmldb.html rename to extras/httpsrv/home/testxmldb.html diff --git a/harbour/extras/httpsrv/home/xsl/based.xsl b/extras/httpsrv/home/xsl/based.xsl similarity index 100% rename from harbour/extras/httpsrv/home/xsl/based.xsl rename to extras/httpsrv/home/xsl/based.xsl diff --git a/harbour/extras/httpsrv/home/xsl/basep.xsl b/extras/httpsrv/home/xsl/basep.xsl similarity index 100% rename from harbour/extras/httpsrv/home/xsl/basep.xsl rename to extras/httpsrv/home/xsl/basep.xsl diff --git a/harbour/extras/httpsrv/modules.hbp b/extras/httpsrv/modules.hbp similarity index 100% rename from harbour/extras/httpsrv/modules.hbp rename to extras/httpsrv/modules.hbp diff --git a/harbour/extras/httpsrv/modules/cookie.prg b/extras/httpsrv/modules/cookie.prg similarity index 100% rename from harbour/extras/httpsrv/modules/cookie.prg rename to extras/httpsrv/modules/cookie.prg diff --git a/harbour/extras/httpsrv/modules/info.prg b/extras/httpsrv/modules/info.prg similarity index 100% rename from harbour/extras/httpsrv/modules/info.prg rename to extras/httpsrv/modules/info.prg diff --git a/harbour/extras/httpsrv/modules/showcounter.prg b/extras/httpsrv/modules/showcounter.prg similarity index 100% rename from harbour/extras/httpsrv/modules/showcounter.prg rename to extras/httpsrv/modules/showcounter.prg diff --git a/harbour/extras/httpsrv/modules/tableservletdb.prg b/extras/httpsrv/modules/tableservletdb.prg similarity index 100% rename from harbour/extras/httpsrv/modules/tableservletdb.prg rename to extras/httpsrv/modules/tableservletdb.prg diff --git a/harbour/extras/httpsrv/modules/testajax.prg b/extras/httpsrv/modules/testajax.prg similarity index 100% rename from harbour/extras/httpsrv/modules/testajax.prg rename to extras/httpsrv/modules/testajax.prg diff --git a/harbour/extras/httpsrv/modulesg.hbp b/extras/httpsrv/modulesg.hbp similarity index 100% rename from harbour/extras/httpsrv/modulesg.hbp rename to extras/httpsrv/modulesg.hbp diff --git a/harbour/extras/httpsrv/readme.txt b/extras/httpsrv/readme.txt similarity index 100% rename from harbour/extras/httpsrv/readme.txt rename to extras/httpsrv/readme.txt diff --git a/harbour/extras/httpsrv/session.prg b/extras/httpsrv/session.prg similarity index 100% rename from harbour/extras/httpsrv/session.prg rename to extras/httpsrv/session.prg diff --git a/harbour/extras/httpsrv/uhttpd.hbp b/extras/httpsrv/uhttpd.hbp similarity index 100% rename from harbour/extras/httpsrv/uhttpd.hbp rename to extras/httpsrv/uhttpd.hbp diff --git a/harbour/extras/httpsrv/uhttpd.ini b/extras/httpsrv/uhttpd.ini similarity index 100% rename from harbour/extras/httpsrv/uhttpd.ini rename to extras/httpsrv/uhttpd.ini diff --git a/harbour/extras/httpsrv/uhttpd.prg b/extras/httpsrv/uhttpd.prg similarity index 100% rename from harbour/extras/httpsrv/uhttpd.prg rename to extras/httpsrv/uhttpd.prg diff --git a/harbour/extras/httpsrv/uhttpdgd.hbp b/extras/httpsrv/uhttpdgd.hbp similarity index 100% rename from harbour/extras/httpsrv/uhttpdgd.hbp rename to extras/httpsrv/uhttpdgd.hbp diff --git a/harbour/extras/ps32/ps32.dif b/extras/ps32/ps32.dif similarity index 100% rename from harbour/extras/ps32/ps32.dif rename to extras/ps32/ps32.dif diff --git a/harbour/extras/ps32/ps32.hbc b/extras/ps32/ps32.hbc similarity index 100% rename from harbour/extras/ps32/ps32.hbc rename to extras/ps32/ps32.hbc diff --git a/harbour/extras/ps32/ps32.hbp b/extras/ps32/ps32.hbp similarity index 100% rename from harbour/extras/ps32/ps32.hbp rename to extras/ps32/ps32.hbp diff --git a/harbour/extras/ps32/readme.txt b/extras/ps32/readme.txt similarity index 100% rename from harbour/extras/ps32/readme.txt rename to extras/ps32/readme.txt diff --git a/harbour/extras/ps32/tests/hbmk.hbm b/extras/ps32/tests/hbmk.hbm similarity index 100% rename from harbour/extras/ps32/tests/hbmk.hbm rename to extras/ps32/tests/hbmk.hbm diff --git a/harbour/extras/rddado/adordd.ch b/extras/rddado/adordd.ch similarity index 100% rename from harbour/extras/rddado/adordd.ch rename to extras/rddado/adordd.ch diff --git a/harbour/extras/rddado/adordd.prg b/extras/rddado/adordd.prg similarity index 100% rename from harbour/extras/rddado/adordd.prg rename to extras/rddado/adordd.prg diff --git a/harbour/extras/rddado/rddado.hbc b/extras/rddado/rddado.hbc similarity index 100% rename from harbour/extras/rddado/rddado.hbc rename to extras/rddado/rddado.hbc diff --git a/harbour/extras/rddado/rddado.hbp b/extras/rddado/rddado.hbp similarity index 100% rename from harbour/extras/rddado/rddado.hbp rename to extras/rddado/rddado.hbp diff --git a/harbour/extras/rddado/rddado.hbx b/extras/rddado/rddado.hbx similarity index 100% rename from harbour/extras/rddado/rddado.hbx rename to extras/rddado/rddado.hbx diff --git a/harbour/extras/rddado/tests/access1.prg b/extras/rddado/tests/access1.prg similarity index 100% rename from harbour/extras/rddado/tests/access1.prg rename to extras/rddado/tests/access1.prg diff --git a/harbour/extras/rddado/tests/access2.prg b/extras/rddado/tests/access2.prg similarity index 100% rename from harbour/extras/rddado/tests/access2.prg rename to extras/rddado/tests/access2.prg diff --git a/harbour/extras/rddado/tests/hbmk.hbm b/extras/rddado/tests/hbmk.hbm similarity index 100% rename from harbour/extras/rddado/tests/hbmk.hbm rename to extras/rddado/tests/hbmk.hbm diff --git a/harbour/extras/rddado/tests/mysql1.prg b/extras/rddado/tests/mysql1.prg similarity index 100% rename from harbour/extras/rddado/tests/mysql1.prg rename to extras/rddado/tests/mysql1.prg diff --git a/harbour/extras/rddado/tests/mysql3.prg b/extras/rddado/tests/mysql3.prg similarity index 100% rename from harbour/extras/rddado/tests/mysql3.prg rename to extras/rddado/tests/mysql3.prg diff --git a/harbour/extras/rddado/tests/test.mdb b/extras/rddado/tests/test.mdb similarity index 100% rename from harbour/extras/rddado/tests/test.mdb rename to extras/rddado/tests/test.mdb diff --git a/harbour/extras/rl/readme.txt b/extras/rl/readme.txt similarity index 100% rename from harbour/extras/rl/readme.txt rename to extras/rl/readme.txt diff --git a/harbour/extras/rl/rl.dif b/extras/rl/rl.dif similarity index 100% rename from harbour/extras/rl/rl.dif rename to extras/rl/rl.dif diff --git a/harbour/extras/rl/rl.hbp b/extras/rl/rl.hbp similarity index 100% rename from harbour/extras/rl/rl.hbp rename to extras/rl/rl.hbp diff --git a/harbour/extras/superlib/hbsuper.prg b/extras/superlib/hbsuper.prg similarity index 100% rename from harbour/extras/superlib/hbsuper.prg rename to extras/superlib/hbsuper.prg diff --git a/harbour/extras/superlib/readme.txt b/extras/superlib/readme.txt similarity index 100% rename from harbour/extras/superlib/readme.txt rename to extras/superlib/readme.txt diff --git a/harbour/extras/superlib/superlib.dif b/extras/superlib/superlib.dif similarity index 100% rename from harbour/extras/superlib/superlib.dif rename to extras/superlib/superlib.dif diff --git a/harbour/extras/superlib/superlib.hbc b/extras/superlib/superlib.hbc similarity index 100% rename from harbour/extras/superlib/superlib.hbc rename to extras/superlib/superlib.hbc diff --git a/harbour/extras/superlib/superlib.hbp b/extras/superlib/superlib.hbp similarity index 100% rename from harbour/extras/superlib/superlib.hbp rename to extras/superlib/superlib.hbp diff --git a/harbour/extras/template/core.prg b/extras/template/core.prg similarity index 100% rename from harbour/extras/template/core.prg rename to extras/template/core.prg diff --git a/harbour/extras/template/corec.c b/extras/template/corec.c similarity index 100% rename from harbour/extras/template/corec.c rename to extras/template/corec.c diff --git a/harbour/extras/template/hbtpl.ch b/extras/template/hbtpl.ch similarity index 100% rename from harbour/extras/template/hbtpl.ch rename to extras/template/hbtpl.ch diff --git a/harbour/extras/template/hbtpl.hbc b/extras/template/hbtpl.hbc similarity index 100% rename from harbour/extras/template/hbtpl.hbc rename to extras/template/hbtpl.hbc diff --git a/harbour/extras/template/hbtpl.hbp b/extras/template/hbtpl.hbp similarity index 100% rename from harbour/extras/template/hbtpl.hbp rename to extras/template/hbtpl.hbp diff --git a/harbour/extras/template/hbtpl.hbx b/extras/template/hbtpl.hbx similarity index 100% rename from harbour/extras/template/hbtpl.hbx rename to extras/template/hbtpl.hbx diff --git a/harbour/extras/template/readme.txt b/extras/template/readme.txt similarity index 100% rename from harbour/extras/template/readme.txt rename to extras/template/readme.txt diff --git a/harbour/extras/template/tests/hbmk.hbm b/extras/template/tests/hbmk.hbm similarity index 100% rename from harbour/extras/template/tests/hbmk.hbm rename to extras/template/tests/hbmk.hbm diff --git a/harbour/extras/template/tests/hbstart.hb b/extras/template/tests/hbstart.hb similarity index 100% rename from harbour/extras/template/tests/hbstart.hb rename to extras/template/tests/hbstart.hb diff --git a/harbour/extras/template/tests/sample.prg b/extras/template/tests/sample.prg similarity index 100% rename from harbour/extras/template/tests/sample.prg rename to extras/template/tests/sample.prg diff --git a/harbour/extras/template/tests/test.prg b/extras/template/tests/test.prg similarity index 100% rename from harbour/extras/template/tests/test.prg rename to extras/template/tests/test.prg diff --git a/harbour/include/Makefile b/include/Makefile similarity index 100% rename from harbour/include/Makefile rename to include/Makefile diff --git a/harbour/include/achoice.ch b/include/achoice.ch similarity index 100% rename from harbour/include/achoice.ch rename to include/achoice.ch diff --git a/harbour/include/assert.ch b/include/assert.ch similarity index 100% rename from harbour/include/assert.ch rename to include/assert.ch diff --git a/harbour/include/blob.ch b/include/blob.ch similarity index 100% rename from harbour/include/blob.ch rename to include/blob.ch diff --git a/harbour/include/box.ch b/include/box.ch similarity index 100% rename from harbour/include/box.ch rename to include/box.ch diff --git a/harbour/include/button.ch b/include/button.ch similarity index 100% rename from harbour/include/button.ch rename to include/button.ch diff --git a/harbour/include/clipdefs.h b/include/clipdefs.h similarity index 100% rename from harbour/include/clipdefs.h rename to include/clipdefs.h diff --git a/harbour/include/color.ch b/include/color.ch similarity index 100% rename from harbour/include/color.ch rename to include/color.ch diff --git a/harbour/include/common.ch b/include/common.ch similarity index 100% rename from harbour/include/common.ch rename to include/common.ch diff --git a/harbour/include/dbedit.ch b/include/dbedit.ch similarity index 100% rename from harbour/include/dbedit.ch rename to include/dbedit.ch diff --git a/harbour/include/dbinfo.ch b/include/dbinfo.ch similarity index 100% rename from harbour/include/dbinfo.ch rename to include/dbinfo.ch diff --git a/harbour/include/dbstruct.ch b/include/dbstruct.ch similarity index 100% rename from harbour/include/dbstruct.ch rename to include/dbstruct.ch diff --git a/harbour/include/directry.ch b/include/directry.ch similarity index 100% rename from harbour/include/directry.ch rename to include/directry.ch diff --git a/harbour/include/error.api b/include/error.api similarity index 100% rename from harbour/include/error.api rename to include/error.api diff --git a/harbour/include/error.ch b/include/error.ch similarity index 100% rename from harbour/include/error.ch rename to include/error.ch diff --git a/harbour/include/extend.api b/include/extend.api similarity index 100% rename from harbour/include/extend.api rename to include/extend.api diff --git a/harbour/include/extend.h b/include/extend.h similarity index 100% rename from harbour/include/extend.h rename to include/extend.h diff --git a/harbour/include/fileio.ch b/include/fileio.ch similarity index 100% rename from harbour/include/fileio.ch rename to include/fileio.ch diff --git a/harbour/include/filesys.api b/include/filesys.api similarity index 100% rename from harbour/include/filesys.api rename to include/filesys.api diff --git a/harbour/include/fm.api b/include/fm.api similarity index 100% rename from harbour/include/fm.api rename to include/fm.api diff --git a/harbour/include/getexit.ch b/include/getexit.ch similarity index 100% rename from harbour/include/getexit.ch rename to include/getexit.ch diff --git a/harbour/include/gt.api b/include/gt.api similarity index 100% rename from harbour/include/gt.api rename to include/gt.api diff --git a/harbour/include/harbour.hbx b/include/harbour.hbx similarity index 100% rename from harbour/include/harbour.hbx rename to include/harbour.hbx diff --git a/harbour/include/hb.ch b/include/hb.ch similarity index 100% rename from harbour/include/hb.ch rename to include/hb.ch diff --git a/harbour/include/hb_io.h b/include/hb_io.h similarity index 100% rename from harbour/include/hb_io.h rename to include/hb_io.h diff --git a/harbour/include/hbapi.h b/include/hbapi.h similarity index 100% rename from harbour/include/hbapi.h rename to include/hbapi.h diff --git a/harbour/include/hbapicdp.h b/include/hbapicdp.h similarity index 100% rename from harbour/include/hbapicdp.h rename to include/hbapicdp.h diff --git a/harbour/include/hbapicls.h b/include/hbapicls.h similarity index 100% rename from harbour/include/hbapicls.h rename to include/hbapicls.h diff --git a/harbour/include/hbapicom.h b/include/hbapicom.h similarity index 100% rename from harbour/include/hbapicom.h rename to include/hbapicom.h diff --git a/harbour/include/hbapidbg.h b/include/hbapidbg.h similarity index 100% rename from harbour/include/hbapidbg.h rename to include/hbapidbg.h diff --git a/harbour/include/hbapierr.h b/include/hbapierr.h similarity index 100% rename from harbour/include/hbapierr.h rename to include/hbapierr.h diff --git a/harbour/include/hbapifs.h b/include/hbapifs.h similarity index 100% rename from harbour/include/hbapifs.h rename to include/hbapifs.h diff --git a/harbour/include/hbapigt.h b/include/hbapigt.h similarity index 100% rename from harbour/include/hbapigt.h rename to include/hbapigt.h diff --git a/harbour/include/hbapiitm.h b/include/hbapiitm.h similarity index 100% rename from harbour/include/hbapiitm.h rename to include/hbapiitm.h diff --git a/harbour/include/hbapilng.h b/include/hbapilng.h similarity index 100% rename from harbour/include/hbapilng.h rename to include/hbapilng.h diff --git a/harbour/include/hbapirdd.h b/include/hbapirdd.h similarity index 100% rename from harbour/include/hbapirdd.h rename to include/hbapirdd.h diff --git a/harbour/include/hbapistr.h b/include/hbapistr.h similarity index 100% rename from harbour/include/hbapistr.h rename to include/hbapistr.h diff --git a/harbour/include/hbassert.h b/include/hbassert.h similarity index 100% rename from harbour/include/hbassert.h rename to include/hbassert.h diff --git a/harbour/include/hbatomic.h b/include/hbatomic.h similarity index 100% rename from harbour/include/hbatomic.h rename to include/hbatomic.h diff --git a/harbour/include/hbbfish.h b/include/hbbfish.h similarity index 100% rename from harbour/include/hbbfish.h rename to include/hbbfish.h diff --git a/harbour/include/hbcdpreg.h b/include/hbcdpreg.h similarity index 100% rename from harbour/include/hbcdpreg.h rename to include/hbcdpreg.h diff --git a/harbour/include/hbchksum.h b/include/hbchksum.h similarity index 100% rename from harbour/include/hbchksum.h rename to include/hbchksum.h diff --git a/harbour/include/hbclass.ch b/include/hbclass.ch similarity index 100% rename from harbour/include/hbclass.ch rename to include/hbclass.ch diff --git a/harbour/include/hbcom.ch b/include/hbcom.ch similarity index 100% rename from harbour/include/hbcom.ch rename to include/hbcom.ch diff --git a/harbour/include/hbcomp.h b/include/hbcomp.h similarity index 100% rename from harbour/include/hbcomp.h rename to include/hbcomp.h diff --git a/harbour/include/hbcompdf.h b/include/hbcompdf.h similarity index 100% rename from harbour/include/hbcompdf.h rename to include/hbcompdf.h diff --git a/harbour/include/hbcpage.hbx b/include/hbcpage.hbx similarity index 100% rename from harbour/include/hbcpage.hbx rename to include/hbcpage.hbx diff --git a/harbour/include/hbdate.h b/include/hbdate.h similarity index 100% rename from harbour/include/hbdate.h rename to include/hbdate.h diff --git a/harbour/include/hbdbf.h b/include/hbdbf.h similarity index 100% rename from harbour/include/hbdbf.h rename to include/hbdbf.h diff --git a/harbour/include/hbdbferr.h b/include/hbdbferr.h similarity index 100% rename from harbour/include/hbdbferr.h rename to include/hbdbferr.h diff --git a/harbour/include/hbdbsort.h b/include/hbdbsort.h similarity index 100% rename from harbour/include/hbdbsort.h rename to include/hbdbsort.h diff --git a/harbour/include/hbdebug.ch b/include/hbdebug.ch similarity index 100% rename from harbour/include/hbdebug.ch rename to include/hbdebug.ch diff --git a/harbour/include/hbdefs.h b/include/hbdefs.h similarity index 100% rename from harbour/include/hbdefs.h rename to include/hbdefs.h diff --git a/harbour/include/hbdyn.ch b/include/hbdyn.ch similarity index 100% rename from harbour/include/hbdyn.ch rename to include/hbdyn.ch diff --git a/harbour/include/hberrors.h b/include/hberrors.h similarity index 100% rename from harbour/include/hberrors.h rename to include/hberrors.h diff --git a/harbour/include/hbexpra.c b/include/hbexpra.c similarity index 100% rename from harbour/include/hbexpra.c rename to include/hbexpra.c diff --git a/harbour/include/hbexprb.c b/include/hbexprb.c similarity index 100% rename from harbour/include/hbexprb.c rename to include/hbexprb.c diff --git a/harbour/include/hbexprop.h b/include/hbexprop.h similarity index 100% rename from harbour/include/hbexprop.h rename to include/hbexprop.h diff --git a/harbour/include/hbextcdp.ch b/include/hbextcdp.ch similarity index 100% rename from harbour/include/hbextcdp.ch rename to include/hbextcdp.ch diff --git a/harbour/include/hbextern.ch b/include/hbextern.ch similarity index 100% rename from harbour/include/hbextern.ch rename to include/hbextern.ch diff --git a/harbour/include/hbextlng.ch b/include/hbextlng.ch similarity index 100% rename from harbour/include/hbextlng.ch rename to include/hbextlng.ch diff --git a/harbour/include/hbfloat.h b/include/hbfloat.h similarity index 100% rename from harbour/include/hbfloat.h rename to include/hbfloat.h diff --git a/harbour/include/hbgfx.ch b/include/hbgfx.ch similarity index 100% rename from harbour/include/hbgfx.ch rename to include/hbgfx.ch diff --git a/harbour/include/hbgfxdef.ch b/include/hbgfxdef.ch similarity index 100% rename from harbour/include/hbgfxdef.ch rename to include/hbgfxdef.ch diff --git a/harbour/include/hbgtcore.h b/include/hbgtcore.h similarity index 100% rename from harbour/include/hbgtcore.h rename to include/hbgtcore.h diff --git a/harbour/include/hbgtinfo.ch b/include/hbgtinfo.ch similarity index 100% rename from harbour/include/hbgtinfo.ch rename to include/hbgtinfo.ch diff --git a/harbour/include/hbgtreg.h b/include/hbgtreg.h similarity index 100% rename from harbour/include/hbgtreg.h rename to include/hbgtreg.h diff --git a/harbour/include/hbhash.ch b/include/hbhash.ch similarity index 100% rename from harbour/include/hbhash.ch rename to include/hbhash.ch diff --git a/harbour/include/hbhash.h b/include/hbhash.h similarity index 100% rename from harbour/include/hbhash.h rename to include/hbhash.h diff --git a/harbour/include/hbhrb.ch b/include/hbhrb.ch similarity index 100% rename from harbour/include/hbhrb.ch rename to include/hbhrb.ch diff --git a/harbour/include/hbiniseg.h b/include/hbiniseg.h similarity index 100% rename from harbour/include/hbiniseg.h rename to include/hbiniseg.h diff --git a/harbour/include/hbinit.h b/include/hbinit.h similarity index 100% rename from harbour/include/hbinit.h rename to include/hbinit.h diff --git a/harbour/include/hbinkey.ch b/include/hbinkey.ch similarity index 100% rename from harbour/include/hbinkey.ch rename to include/hbinkey.ch diff --git a/harbour/include/hbjson.h b/include/hbjson.h similarity index 100% rename from harbour/include/hbjson.h rename to include/hbjson.h diff --git a/harbour/include/hblang.ch b/include/hblang.ch similarity index 100% rename from harbour/include/hblang.ch rename to include/hblang.ch diff --git a/harbour/include/hblang.hbx b/include/hblang.hbx similarity index 100% rename from harbour/include/hblang.hbx rename to include/hblang.hbx diff --git a/harbour/include/hblpp.ch b/include/hblpp.ch similarity index 100% rename from harbour/include/hblpp.ch rename to include/hblpp.ch diff --git a/harbour/include/hblpp.h b/include/hblpp.h similarity index 100% rename from harbour/include/hblpp.h rename to include/hblpp.h diff --git a/harbour/include/hbmacro.ch b/include/hbmacro.ch similarity index 100% rename from harbour/include/hbmacro.ch rename to include/hbmacro.ch diff --git a/harbour/include/hbmacro.h b/include/hbmacro.h similarity index 100% rename from harbour/include/hbmacro.h rename to include/hbmacro.h diff --git a/harbour/include/hbmath.ch b/include/hbmath.ch similarity index 100% rename from harbour/include/hbmath.ch rename to include/hbmath.ch diff --git a/harbour/include/hbmath.h b/include/hbmath.h similarity index 100% rename from harbour/include/hbmath.h rename to include/hbmath.h diff --git a/harbour/include/hbmather.h b/include/hbmather.h similarity index 100% rename from harbour/include/hbmather.h rename to include/hbmather.h diff --git a/harbour/include/hbmemory.ch b/include/hbmemory.ch similarity index 100% rename from harbour/include/hbmemory.ch rename to include/hbmemory.ch diff --git a/harbour/include/hbmemvar.ch b/include/hbmemvar.ch similarity index 100% rename from harbour/include/hbmemvar.ch rename to include/hbmemvar.ch diff --git a/harbour/include/hbmsgreg.h b/include/hbmsgreg.h similarity index 100% rename from harbour/include/hbmsgreg.h rename to include/hbmsgreg.h diff --git a/harbour/include/hboo.ch b/include/hboo.ch similarity index 100% rename from harbour/include/hboo.ch rename to include/hboo.ch diff --git a/harbour/include/hbpcode.h b/include/hbpcode.h similarity index 100% rename from harbour/include/hbpcode.h rename to include/hbpcode.h diff --git a/harbour/include/hbpers.ch b/include/hbpers.ch similarity index 100% rename from harbour/include/hbpers.ch rename to include/hbpers.ch diff --git a/harbour/include/hbpp.h b/include/hbpp.h similarity index 100% rename from harbour/include/hbpp.h rename to include/hbpp.h diff --git a/harbour/include/hbrddcdx.h b/include/hbrddcdx.h similarity index 100% rename from harbour/include/hbrddcdx.h rename to include/hbrddcdx.h diff --git a/harbour/include/hbrdddbf.h b/include/hbrdddbf.h similarity index 100% rename from harbour/include/hbrdddbf.h rename to include/hbrdddbf.h diff --git a/harbour/include/hbrdddel.h b/include/hbrdddel.h similarity index 100% rename from harbour/include/hbrdddel.h rename to include/hbrdddel.h diff --git a/harbour/include/hbrddfpt.h b/include/hbrddfpt.h similarity index 100% rename from harbour/include/hbrddfpt.h rename to include/hbrddfpt.h diff --git a/harbour/include/hbrddnsx.h b/include/hbrddnsx.h similarity index 100% rename from harbour/include/hbrddnsx.h rename to include/hbrddnsx.h diff --git a/harbour/include/hbrddntx.h b/include/hbrddntx.h similarity index 100% rename from harbour/include/hbrddntx.h rename to include/hbrddntx.h diff --git a/harbour/include/hbrddsdf.h b/include/hbrddsdf.h similarity index 100% rename from harbour/include/hbrddsdf.h rename to include/hbrddsdf.h diff --git a/harbour/include/hbregex.h b/include/hbregex.h similarity index 100% rename from harbour/include/hbregex.h rename to include/hbregex.h diff --git a/harbour/include/hbscalar.hbx b/include/hbscalar.hbx similarity index 100% rename from harbour/include/hbscalar.hbx rename to include/hbscalar.hbx diff --git a/harbour/include/hbset.h b/include/hbset.h similarity index 100% rename from harbour/include/hbset.h rename to include/hbset.h diff --git a/harbour/include/hbsetup.ch b/include/hbsetup.ch similarity index 100% rename from harbour/include/hbsetup.ch rename to include/hbsetup.ch diff --git a/harbour/include/hbsetup.h b/include/hbsetup.h similarity index 100% rename from harbour/include/hbsetup.h rename to include/hbsetup.h diff --git a/harbour/include/hbsix.ch b/include/hbsix.ch similarity index 100% rename from harbour/include/hbsix.ch rename to include/hbsix.ch diff --git a/harbour/include/hbsocket.ch b/include/hbsocket.ch similarity index 100% rename from harbour/include/hbsocket.ch rename to include/hbsocket.ch diff --git a/harbour/include/hbsocket.h b/include/hbsocket.h similarity index 100% rename from harbour/include/hbsocket.h rename to include/hbsocket.h diff --git a/harbour/include/hbstack.h b/include/hbstack.h similarity index 100% rename from harbour/include/hbstack.h rename to include/hbstack.h diff --git a/harbour/include/hbstdgen.ch b/include/hbstdgen.ch similarity index 100% rename from harbour/include/hbstdgen.ch rename to include/hbstdgen.ch diff --git a/harbour/include/hbstrict.ch b/include/hbstrict.ch similarity index 100% rename from harbour/include/hbstrict.ch rename to include/hbstrict.ch diff --git a/harbour/include/hbsxdef.ch b/include/hbsxdef.ch similarity index 100% rename from harbour/include/hbsxdef.ch rename to include/hbsxdef.ch diff --git a/harbour/include/hbsxfunc.h b/include/hbsxfunc.h similarity index 100% rename from harbour/include/hbsxfunc.h rename to include/hbsxfunc.h diff --git a/harbour/include/hbtask.h b/include/hbtask.h similarity index 100% rename from harbour/include/hbtask.h rename to include/hbtask.h diff --git a/harbour/include/hbthread.ch b/include/hbthread.ch similarity index 100% rename from harbour/include/hbthread.ch rename to include/hbthread.ch diff --git a/harbour/include/hbthread.h b/include/hbthread.h similarity index 100% rename from harbour/include/hbthread.h rename to include/hbthread.h diff --git a/harbour/include/hbtrace.ch b/include/hbtrace.ch similarity index 100% rename from harbour/include/hbtrace.ch rename to include/hbtrace.ch diff --git a/harbour/include/hbtrace.h b/include/hbtrace.h similarity index 100% rename from harbour/include/hbtrace.h rename to include/hbtrace.h diff --git a/harbour/include/hbtypes.h b/include/hbtypes.h similarity index 100% rename from harbour/include/hbtypes.h rename to include/hbtypes.h diff --git a/harbour/include/hbundoc.api b/include/hbundoc.api similarity index 100% rename from harbour/include/hbundoc.api rename to include/hbundoc.api diff --git a/harbour/include/hbusrrdd.ch b/include/hbusrrdd.ch similarity index 100% rename from harbour/include/hbusrrdd.ch rename to include/hbusrrdd.ch diff --git a/harbour/include/hbusrrdd.hbx b/include/hbusrrdd.hbx similarity index 100% rename from harbour/include/hbusrrdd.hbx rename to include/hbusrrdd.hbx diff --git a/harbour/include/hbver.ch b/include/hbver.ch similarity index 100% rename from harbour/include/hbver.ch rename to include/hbver.ch diff --git a/harbour/include/hbver.h b/include/hbver.h similarity index 100% rename from harbour/include/hbver.h rename to include/hbver.h diff --git a/harbour/include/hbvm.h b/include/hbvm.h similarity index 100% rename from harbour/include/hbvm.h rename to include/hbvm.h diff --git a/harbour/include/hbvmint.h b/include/hbvmint.h similarity index 100% rename from harbour/include/hbvmint.h rename to include/hbvmint.h diff --git a/harbour/include/hbvmopt.h b/include/hbvmopt.h similarity index 100% rename from harbour/include/hbvmopt.h rename to include/hbvmopt.h diff --git a/harbour/include/hbvmpub.h b/include/hbvmpub.h similarity index 100% rename from harbour/include/hbvmpub.h rename to include/hbvmpub.h diff --git a/harbour/include/hbwince.h b/include/hbwince.h similarity index 100% rename from harbour/include/hbwince.h rename to include/hbwince.h diff --git a/harbour/include/hbwinuni.h b/include/hbwinuni.h similarity index 100% rename from harbour/include/hbwinuni.h rename to include/hbwinuni.h diff --git a/harbour/include/hbwmain.c b/include/hbwmain.c similarity index 100% rename from harbour/include/hbwmain.c rename to include/hbwmain.c diff --git a/harbour/include/hbxvm.h b/include/hbxvm.h similarity index 100% rename from harbour/include/hbxvm.h rename to include/hbxvm.h diff --git a/harbour/include/hbzlib.ch b/include/hbzlib.ch similarity index 100% rename from harbour/include/hbzlib.ch rename to include/hbzlib.ch diff --git a/harbour/include/hbznet.h b/include/hbznet.h similarity index 100% rename from harbour/include/hbznet.h rename to include/hbznet.h diff --git a/harbour/include/inkey.ch b/include/inkey.ch similarity index 100% rename from harbour/include/inkey.ch rename to include/inkey.ch diff --git a/harbour/include/item.api b/include/item.api similarity index 100% rename from harbour/include/item.api rename to include/item.api diff --git a/harbour/include/memoedit.ch b/include/memoedit.ch similarity index 100% rename from harbour/include/memoedit.ch rename to include/memoedit.ch diff --git a/harbour/include/ord.ch b/include/ord.ch similarity index 100% rename from harbour/include/ord.ch rename to include/ord.ch diff --git a/harbour/include/rdd.api b/include/rdd.api similarity index 100% rename from harbour/include/rdd.api rename to include/rdd.api diff --git a/harbour/include/rddsys.ch b/include/rddsys.ch similarity index 100% rename from harbour/include/rddsys.ch rename to include/rddsys.ch diff --git a/harbour/include/reserved.ch b/include/reserved.ch similarity index 100% rename from harbour/include/reserved.ch rename to include/reserved.ch diff --git a/harbour/include/set.ch b/include/set.ch similarity index 100% rename from harbour/include/set.ch rename to include/set.ch diff --git a/harbour/include/setcurs.ch b/include/setcurs.ch similarity index 100% rename from harbour/include/setcurs.ch rename to include/setcurs.ch diff --git a/harbour/include/simpleio.ch b/include/simpleio.ch similarity index 100% rename from harbour/include/simpleio.ch rename to include/simpleio.ch diff --git a/harbour/include/std.ch b/include/std.ch similarity index 100% rename from harbour/include/std.ch rename to include/std.ch diff --git a/harbour/include/tbrowse.ch b/include/tbrowse.ch similarity index 100% rename from harbour/include/tbrowse.ch rename to include/tbrowse.ch diff --git a/harbour/include/vm.api b/include/vm.api similarity index 100% rename from harbour/include/vm.api rename to include/vm.api diff --git a/harbour/lib/3rd/win/bcc/Makefile b/lib/3rd/win/bcc/Makefile similarity index 100% rename from harbour/lib/3rd/win/bcc/Makefile rename to lib/3rd/win/bcc/Makefile diff --git a/harbour/lib/3rd/win/bcc/unicows.lib b/lib/3rd/win/bcc/unicows.lib similarity index 100% rename from harbour/lib/3rd/win/bcc/unicows.lib rename to lib/3rd/win/bcc/unicows.lib diff --git a/harbour/lib/3rd/win/bcc/unicows_license.txt b/lib/3rd/win/bcc/unicows_license.txt similarity index 100% rename from harbour/lib/3rd/win/bcc/unicows_license.txt rename to lib/3rd/win/bcc/unicows_license.txt diff --git a/harbour/lib/3rd/win/mingw/Makefile b/lib/3rd/win/mingw/Makefile similarity index 100% rename from harbour/lib/3rd/win/mingw/Makefile rename to lib/3rd/win/mingw/Makefile diff --git a/harbour/lib/3rd/win/mingw/libunicows.a b/lib/3rd/win/mingw/libunicows.a similarity index 100% rename from harbour/lib/3rd/win/mingw/libunicows.a rename to lib/3rd/win/mingw/libunicows.a diff --git a/harbour/lib/3rd/win/mingw/libunicows_license.txt b/lib/3rd/win/mingw/libunicows_license.txt similarity index 100% rename from harbour/lib/3rd/win/mingw/libunicows_license.txt rename to lib/3rd/win/mingw/libunicows_license.txt diff --git a/harbour/os2-make.exe b/os2-make.exe similarity index 100% rename from harbour/os2-make.exe rename to os2-make.exe diff --git a/harbour/package/favicon.ico b/package/favicon.ico similarity index 100% rename from harbour/package/favicon.ico rename to package/favicon.ico diff --git a/harbour/package/harb_os2.ico b/package/harb_os2.ico similarity index 100% rename from harbour/package/harb_os2.ico rename to package/harb_os2.ico diff --git a/harbour/package/harb_osx.icns b/package/harb_osx.icns similarity index 100% rename from harbour/package/harb_osx.icns rename to package/harb_osx.icns diff --git a/harbour/package/harb_win.ico b/package/harb_win.ico similarity index 100% rename from harbour/package/harb_win.ico rename to package/harb_win.ico diff --git a/harbour/package/harb_win.mft b/package/harb_win.mft similarity index 100% rename from harbour/package/harb_win.mft rename to package/harb_win.mft diff --git a/harbour/package/harb_win.rc b/package/harb_win.rc similarity index 100% rename from harbour/package/harb_win.rc rename to package/harb_win.rc diff --git a/harbour/package/harbour-wce.spec.in b/package/harbour-wce.spec.in similarity index 100% rename from harbour/package/harbour-wce.spec.in rename to package/harbour-wce.spec.in diff --git a/harbour/package/harbour-win.spec.in b/package/harbour-win.spec.in similarity index 100% rename from harbour/package/harbour-win.spec.in rename to package/harbour-win.spec.in diff --git a/harbour/package/harbour.rb b/package/harbour.rb similarity index 100% rename from harbour/package/harbour.rb rename to package/harbour.rb diff --git a/harbour/package/harbour.spec b/package/harbour.spec similarity index 100% rename from harbour/package/harbour.spec rename to package/harbour.spec diff --git a/harbour/package/mpkg_rpm.sh b/package/mpkg_rpm.sh similarity index 100% rename from harbour/package/mpkg_rpm.sh rename to package/mpkg_rpm.sh diff --git a/harbour/package/mpkg_rpm_wce.sh b/package/mpkg_rpm_wce.sh similarity index 100% rename from harbour/package/mpkg_rpm_wce.sh rename to package/mpkg_rpm_wce.sh diff --git a/harbour/package/mpkg_rpm_win.sh b/package/mpkg_rpm_win.sh similarity index 100% rename from harbour/package/mpkg_rpm_win.sh rename to package/mpkg_rpm_win.sh diff --git a/harbour/package/mpkg_src.sh b/package/mpkg_src.sh similarity index 100% rename from harbour/package/mpkg_src.sh rename to package/mpkg_src.sh diff --git a/harbour/package/mpkg_src_nightly.sh b/package/mpkg_src_nightly.sh similarity index 100% rename from harbour/package/mpkg_src_nightly.sh rename to package/mpkg_src_nightly.sh diff --git a/harbour/package/mpkg_ver.sh b/package/mpkg_ver.sh similarity index 100% rename from harbour/package/mpkg_ver.sh rename to package/mpkg_ver.sh diff --git a/harbour/package/mpkg_win.nsi b/package/mpkg_win.nsi similarity index 100% rename from harbour/package/mpkg_win.nsi rename to package/mpkg_win.nsi diff --git a/harbour/package/mpkg_win_nightly.bat b/package/mpkg_win_nightly.bat similarity index 100% rename from harbour/package/mpkg_win_nightly.bat rename to package/mpkg_win_nightly.bat diff --git a/harbour/package/updt_web_nightly.sh b/package/updt_web_nightly.sh similarity index 100% rename from harbour/package/updt_web_nightly.sh rename to package/updt_web_nightly.sh diff --git a/harbour/package/winuni/HARBOUR_README_ADDONS.txt b/package/winuni/HARBOUR_README_ADDONS.txt similarity index 100% rename from harbour/package/winuni/HARBOUR_README_ADDONS.txt rename to package/winuni/HARBOUR_README_ADDONS.txt diff --git a/harbour/package/winuni/HARBOUR_README_DJGPP.txt b/package/winuni/HARBOUR_README_DJGPP.txt similarity index 100% rename from harbour/package/winuni/HARBOUR_README_DJGPP.txt rename to package/winuni/HARBOUR_README_DJGPP.txt diff --git a/harbour/package/winuni/HARBOUR_README_MINGW.txt b/package/winuni/HARBOUR_README_MINGW.txt similarity index 100% rename from harbour/package/winuni/HARBOUR_README_MINGW.txt rename to package/winuni/HARBOUR_README_MINGW.txt diff --git a/harbour/package/winuni/HARBOUR_README_MINGW64.txt b/package/winuni/HARBOUR_README_MINGW64.txt similarity index 100% rename from harbour/package/winuni/HARBOUR_README_MINGW64.txt rename to package/winuni/HARBOUR_README_MINGW64.txt diff --git a/harbour/package/winuni/HARBOUR_README_MINGWARM.txt b/package/winuni/HARBOUR_README_MINGWARM.txt similarity index 100% rename from harbour/package/winuni/HARBOUR_README_MINGWARM.txt rename to package/winuni/HARBOUR_README_MINGWARM.txt diff --git a/harbour/package/winuni/HARBOUR_README_POCC.txt b/package/winuni/HARBOUR_README_POCC.txt similarity index 100% rename from harbour/package/winuni/HARBOUR_README_POCC.txt rename to package/winuni/HARBOUR_README_POCC.txt diff --git a/harbour/package/winuni/HARBOUR_README_WATCOM.txt b/package/winuni/HARBOUR_README_WATCOM.txt similarity index 100% rename from harbour/package/winuni/HARBOUR_README_WATCOM.txt rename to package/winuni/HARBOUR_README_WATCOM.txt diff --git a/harbour/package/winuni/RELNOTES.txt b/package/winuni/RELNOTES.txt similarity index 100% rename from harbour/package/winuni/RELNOTES.txt rename to package/winuni/RELNOTES.txt diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/package/winuni/mpkg_win_uni.bat similarity index 100% rename from harbour/package/winuni/mpkg_win_uni.bat rename to package/winuni/mpkg_win_uni.bat diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/package/winuni/mpkg_win_uni.nsi similarity index 100% rename from harbour/package/winuni/mpkg_win_uni.nsi rename to package/winuni/mpkg_win_uni.nsi diff --git a/harbour/src/3rd/Makefile b/src/3rd/Makefile similarity index 100% rename from harbour/src/3rd/Makefile rename to src/3rd/Makefile diff --git a/harbour/src/3rd/hbpmcom/Makefile b/src/3rd/hbpmcom/Makefile similarity index 100% rename from harbour/src/3rd/hbpmcom/Makefile rename to src/3rd/hbpmcom/Makefile diff --git a/harbour/src/3rd/hbpmcom/com.c b/src/3rd/hbpmcom/com.c similarity index 100% rename from harbour/src/3rd/hbpmcom/com.c rename to src/3rd/hbpmcom/com.c diff --git a/harbour/src/3rd/hbpmcom/com.h b/src/3rd/hbpmcom/com.h similarity index 100% rename from harbour/src/3rd/hbpmcom/com.h rename to src/3rd/hbpmcom/com.h diff --git a/harbour/src/3rd/hbpmcom/doc/com.txt b/src/3rd/hbpmcom/doc/com.txt similarity index 100% rename from harbour/src/3rd/hbpmcom/doc/com.txt rename to src/3rd/hbpmcom/doc/com.txt diff --git a/harbour/src/3rd/hbpmcom/doc/readme.txt b/src/3rd/hbpmcom/doc/readme.txt similarity index 100% rename from harbour/src/3rd/hbpmcom/doc/readme.txt rename to src/3rd/hbpmcom/doc/readme.txt diff --git a/harbour/src/3rd/hbpmcom/irq.h b/src/3rd/hbpmcom/irq.h similarity index 100% rename from harbour/src/3rd/hbpmcom/irq.h rename to src/3rd/hbpmcom/irq.h diff --git a/harbour/src/3rd/hbpmcom/irq_g.c b/src/3rd/hbpmcom/irq_g.c similarity index 100% rename from harbour/src/3rd/hbpmcom/irq_g.c rename to src/3rd/hbpmcom/irq_g.c diff --git a/harbour/src/3rd/hbpmcom/irq_ow.c b/src/3rd/hbpmcom/irq_ow.c similarity index 100% rename from harbour/src/3rd/hbpmcom/irq_ow.c rename to src/3rd/hbpmcom/irq_ow.c diff --git a/harbour/src/3rd/hbpmcom/irqwrap.h b/src/3rd/hbpmcom/irqwrap.h similarity index 100% rename from harbour/src/3rd/hbpmcom/irqwrap.h rename to src/3rd/hbpmcom/irqwrap.h diff --git a/harbour/src/3rd/hbpmcom/wrap_g.sx b/src/3rd/hbpmcom/wrap_g.sx similarity index 100% rename from harbour/src/3rd/hbpmcom/wrap_g.sx rename to src/3rd/hbpmcom/wrap_g.sx diff --git a/harbour/src/3rd/hbpmcom/wrap_ow.c b/src/3rd/hbpmcom/wrap_ow.c similarity index 100% rename from harbour/src/3rd/hbpmcom/wrap_ow.c rename to src/3rd/hbpmcom/wrap_ow.c diff --git a/harbour/src/3rd/jpeg/Makefile b/src/3rd/jpeg/Makefile similarity index 100% rename from harbour/src/3rd/jpeg/Makefile rename to src/3rd/jpeg/Makefile diff --git a/harbour/src/3rd/jpeg/README b/src/3rd/jpeg/README similarity index 100% rename from harbour/src/3rd/jpeg/README rename to src/3rd/jpeg/README diff --git a/harbour/src/3rd/jpeg/cderror.h b/src/3rd/jpeg/cderror.h similarity index 100% rename from harbour/src/3rd/jpeg/cderror.h rename to src/3rd/jpeg/cderror.h diff --git a/harbour/src/3rd/jpeg/cdjpeg.h b/src/3rd/jpeg/cdjpeg.h similarity index 100% rename from harbour/src/3rd/jpeg/cdjpeg.h rename to src/3rd/jpeg/cdjpeg.h diff --git a/harbour/src/3rd/jpeg/jaricom.c b/src/3rd/jpeg/jaricom.c similarity index 100% rename from harbour/src/3rd/jpeg/jaricom.c rename to src/3rd/jpeg/jaricom.c diff --git a/harbour/src/3rd/jpeg/jcapimin.c b/src/3rd/jpeg/jcapimin.c similarity index 100% rename from harbour/src/3rd/jpeg/jcapimin.c rename to src/3rd/jpeg/jcapimin.c diff --git a/harbour/src/3rd/jpeg/jcapistd.c b/src/3rd/jpeg/jcapistd.c similarity index 100% rename from harbour/src/3rd/jpeg/jcapistd.c rename to src/3rd/jpeg/jcapistd.c diff --git a/harbour/src/3rd/jpeg/jcarith.c b/src/3rd/jpeg/jcarith.c similarity index 100% rename from harbour/src/3rd/jpeg/jcarith.c rename to src/3rd/jpeg/jcarith.c diff --git a/harbour/src/3rd/jpeg/jccoefct.c b/src/3rd/jpeg/jccoefct.c similarity index 100% rename from harbour/src/3rd/jpeg/jccoefct.c rename to src/3rd/jpeg/jccoefct.c diff --git a/harbour/src/3rd/jpeg/jccolor.c b/src/3rd/jpeg/jccolor.c similarity index 100% rename from harbour/src/3rd/jpeg/jccolor.c rename to src/3rd/jpeg/jccolor.c diff --git a/harbour/src/3rd/jpeg/jcdctmgr.c b/src/3rd/jpeg/jcdctmgr.c similarity index 100% rename from harbour/src/3rd/jpeg/jcdctmgr.c rename to src/3rd/jpeg/jcdctmgr.c diff --git a/harbour/src/3rd/jpeg/jchuff.c b/src/3rd/jpeg/jchuff.c similarity index 100% rename from harbour/src/3rd/jpeg/jchuff.c rename to src/3rd/jpeg/jchuff.c diff --git a/harbour/src/3rd/jpeg/jcinit.c b/src/3rd/jpeg/jcinit.c similarity index 100% rename from harbour/src/3rd/jpeg/jcinit.c rename to src/3rd/jpeg/jcinit.c diff --git a/harbour/src/3rd/jpeg/jcmainct.c b/src/3rd/jpeg/jcmainct.c similarity index 100% rename from harbour/src/3rd/jpeg/jcmainct.c rename to src/3rd/jpeg/jcmainct.c diff --git a/harbour/src/3rd/jpeg/jcmarker.c b/src/3rd/jpeg/jcmarker.c similarity index 100% rename from harbour/src/3rd/jpeg/jcmarker.c rename to src/3rd/jpeg/jcmarker.c diff --git a/harbour/src/3rd/jpeg/jcmaster.c b/src/3rd/jpeg/jcmaster.c similarity index 100% rename from harbour/src/3rd/jpeg/jcmaster.c rename to src/3rd/jpeg/jcmaster.c diff --git a/harbour/src/3rd/jpeg/jcomapi.c b/src/3rd/jpeg/jcomapi.c similarity index 100% rename from harbour/src/3rd/jpeg/jcomapi.c rename to src/3rd/jpeg/jcomapi.c diff --git a/harbour/src/3rd/jpeg/jconfig.h b/src/3rd/jpeg/jconfig.h similarity index 100% rename from harbour/src/3rd/jpeg/jconfig.h rename to src/3rd/jpeg/jconfig.h diff --git a/harbour/src/3rd/jpeg/jcparam.c b/src/3rd/jpeg/jcparam.c similarity index 100% rename from harbour/src/3rd/jpeg/jcparam.c rename to src/3rd/jpeg/jcparam.c diff --git a/harbour/src/3rd/jpeg/jcprepct.c b/src/3rd/jpeg/jcprepct.c similarity index 100% rename from harbour/src/3rd/jpeg/jcprepct.c rename to src/3rd/jpeg/jcprepct.c diff --git a/harbour/src/3rd/jpeg/jcsample.c b/src/3rd/jpeg/jcsample.c similarity index 100% rename from harbour/src/3rd/jpeg/jcsample.c rename to src/3rd/jpeg/jcsample.c diff --git a/harbour/src/3rd/jpeg/jctrans.c b/src/3rd/jpeg/jctrans.c similarity index 100% rename from harbour/src/3rd/jpeg/jctrans.c rename to src/3rd/jpeg/jctrans.c diff --git a/harbour/src/3rd/jpeg/jdapimin.c b/src/3rd/jpeg/jdapimin.c similarity index 100% rename from harbour/src/3rd/jpeg/jdapimin.c rename to src/3rd/jpeg/jdapimin.c diff --git a/harbour/src/3rd/jpeg/jdapistd.c b/src/3rd/jpeg/jdapistd.c similarity index 100% rename from harbour/src/3rd/jpeg/jdapistd.c rename to src/3rd/jpeg/jdapistd.c diff --git a/harbour/src/3rd/jpeg/jdarith.c b/src/3rd/jpeg/jdarith.c similarity index 100% rename from harbour/src/3rd/jpeg/jdarith.c rename to src/3rd/jpeg/jdarith.c diff --git a/harbour/src/3rd/jpeg/jdatadst.c b/src/3rd/jpeg/jdatadst.c similarity index 100% rename from harbour/src/3rd/jpeg/jdatadst.c rename to src/3rd/jpeg/jdatadst.c diff --git a/harbour/src/3rd/jpeg/jdatasrc.c b/src/3rd/jpeg/jdatasrc.c similarity index 100% rename from harbour/src/3rd/jpeg/jdatasrc.c rename to src/3rd/jpeg/jdatasrc.c diff --git a/harbour/src/3rd/jpeg/jdcoefct.c b/src/3rd/jpeg/jdcoefct.c similarity index 100% rename from harbour/src/3rd/jpeg/jdcoefct.c rename to src/3rd/jpeg/jdcoefct.c diff --git a/harbour/src/3rd/jpeg/jdcolor.c b/src/3rd/jpeg/jdcolor.c similarity index 100% rename from harbour/src/3rd/jpeg/jdcolor.c rename to src/3rd/jpeg/jdcolor.c diff --git a/harbour/src/3rd/jpeg/jdct.h b/src/3rd/jpeg/jdct.h similarity index 100% rename from harbour/src/3rd/jpeg/jdct.h rename to src/3rd/jpeg/jdct.h diff --git a/harbour/src/3rd/jpeg/jddctmgr.c b/src/3rd/jpeg/jddctmgr.c similarity index 100% rename from harbour/src/3rd/jpeg/jddctmgr.c rename to src/3rd/jpeg/jddctmgr.c diff --git a/harbour/src/3rd/jpeg/jdhuff.c b/src/3rd/jpeg/jdhuff.c similarity index 100% rename from harbour/src/3rd/jpeg/jdhuff.c rename to src/3rd/jpeg/jdhuff.c diff --git a/harbour/src/3rd/jpeg/jdinput.c b/src/3rd/jpeg/jdinput.c similarity index 100% rename from harbour/src/3rd/jpeg/jdinput.c rename to src/3rd/jpeg/jdinput.c diff --git a/harbour/src/3rd/jpeg/jdmainct.c b/src/3rd/jpeg/jdmainct.c similarity index 100% rename from harbour/src/3rd/jpeg/jdmainct.c rename to src/3rd/jpeg/jdmainct.c diff --git a/harbour/src/3rd/jpeg/jdmarker.c b/src/3rd/jpeg/jdmarker.c similarity index 100% rename from harbour/src/3rd/jpeg/jdmarker.c rename to src/3rd/jpeg/jdmarker.c diff --git a/harbour/src/3rd/jpeg/jdmaster.c b/src/3rd/jpeg/jdmaster.c similarity index 100% rename from harbour/src/3rd/jpeg/jdmaster.c rename to src/3rd/jpeg/jdmaster.c diff --git a/harbour/src/3rd/jpeg/jdmerge.c b/src/3rd/jpeg/jdmerge.c similarity index 100% rename from harbour/src/3rd/jpeg/jdmerge.c rename to src/3rd/jpeg/jdmerge.c diff --git a/harbour/src/3rd/jpeg/jdpostct.c b/src/3rd/jpeg/jdpostct.c similarity index 100% rename from harbour/src/3rd/jpeg/jdpostct.c rename to src/3rd/jpeg/jdpostct.c diff --git a/harbour/src/3rd/jpeg/jdsample.c b/src/3rd/jpeg/jdsample.c similarity index 100% rename from harbour/src/3rd/jpeg/jdsample.c rename to src/3rd/jpeg/jdsample.c diff --git a/harbour/src/3rd/jpeg/jdtrans.c b/src/3rd/jpeg/jdtrans.c similarity index 100% rename from harbour/src/3rd/jpeg/jdtrans.c rename to src/3rd/jpeg/jdtrans.c diff --git a/harbour/src/3rd/jpeg/jerror.c b/src/3rd/jpeg/jerror.c similarity index 100% rename from harbour/src/3rd/jpeg/jerror.c rename to src/3rd/jpeg/jerror.c diff --git a/harbour/src/3rd/jpeg/jerror.h b/src/3rd/jpeg/jerror.h similarity index 100% rename from harbour/src/3rd/jpeg/jerror.h rename to src/3rd/jpeg/jerror.h diff --git a/harbour/src/3rd/jpeg/jfdctflt.c b/src/3rd/jpeg/jfdctflt.c similarity index 100% rename from harbour/src/3rd/jpeg/jfdctflt.c rename to src/3rd/jpeg/jfdctflt.c diff --git a/harbour/src/3rd/jpeg/jfdctfst.c b/src/3rd/jpeg/jfdctfst.c similarity index 100% rename from harbour/src/3rd/jpeg/jfdctfst.c rename to src/3rd/jpeg/jfdctfst.c diff --git a/harbour/src/3rd/jpeg/jfdctint.c b/src/3rd/jpeg/jfdctint.c similarity index 100% rename from harbour/src/3rd/jpeg/jfdctint.c rename to src/3rd/jpeg/jfdctint.c diff --git a/harbour/src/3rd/jpeg/jidctflt.c b/src/3rd/jpeg/jidctflt.c similarity index 100% rename from harbour/src/3rd/jpeg/jidctflt.c rename to src/3rd/jpeg/jidctflt.c diff --git a/harbour/src/3rd/jpeg/jidctfst.c b/src/3rd/jpeg/jidctfst.c similarity index 100% rename from harbour/src/3rd/jpeg/jidctfst.c rename to src/3rd/jpeg/jidctfst.c diff --git a/harbour/src/3rd/jpeg/jidctint.c b/src/3rd/jpeg/jidctint.c similarity index 100% rename from harbour/src/3rd/jpeg/jidctint.c rename to src/3rd/jpeg/jidctint.c diff --git a/harbour/src/3rd/jpeg/jinclude.h b/src/3rd/jpeg/jinclude.h similarity index 100% rename from harbour/src/3rd/jpeg/jinclude.h rename to src/3rd/jpeg/jinclude.h diff --git a/harbour/src/3rd/jpeg/jmemansi.c b/src/3rd/jpeg/jmemansi.c similarity index 100% rename from harbour/src/3rd/jpeg/jmemansi.c rename to src/3rd/jpeg/jmemansi.c diff --git a/harbour/src/3rd/jpeg/jmemdos.c b/src/3rd/jpeg/jmemdos.c similarity index 100% rename from harbour/src/3rd/jpeg/jmemdos.c rename to src/3rd/jpeg/jmemdos.c diff --git a/harbour/src/3rd/jpeg/jmemmac.c b/src/3rd/jpeg/jmemmac.c similarity index 100% rename from harbour/src/3rd/jpeg/jmemmac.c rename to src/3rd/jpeg/jmemmac.c diff --git a/harbour/src/3rd/jpeg/jmemmgr.c b/src/3rd/jpeg/jmemmgr.c similarity index 100% rename from harbour/src/3rd/jpeg/jmemmgr.c rename to src/3rd/jpeg/jmemmgr.c diff --git a/harbour/src/3rd/jpeg/jmemname.c b/src/3rd/jpeg/jmemname.c similarity index 100% rename from harbour/src/3rd/jpeg/jmemname.c rename to src/3rd/jpeg/jmemname.c diff --git a/harbour/src/3rd/jpeg/jmemnobs.c b/src/3rd/jpeg/jmemnobs.c similarity index 100% rename from harbour/src/3rd/jpeg/jmemnobs.c rename to src/3rd/jpeg/jmemnobs.c diff --git a/harbour/src/3rd/jpeg/jmemsys.h b/src/3rd/jpeg/jmemsys.h similarity index 100% rename from harbour/src/3rd/jpeg/jmemsys.h rename to src/3rd/jpeg/jmemsys.h diff --git a/harbour/src/3rd/jpeg/jmorecfg.h b/src/3rd/jpeg/jmorecfg.h similarity index 100% rename from harbour/src/3rd/jpeg/jmorecfg.h rename to src/3rd/jpeg/jmorecfg.h diff --git a/harbour/src/3rd/jpeg/jpeg.dif b/src/3rd/jpeg/jpeg.dif similarity index 100% rename from harbour/src/3rd/jpeg/jpeg.dif rename to src/3rd/jpeg/jpeg.dif diff --git a/harbour/src/3rd/jpeg/jpegint.h b/src/3rd/jpeg/jpegint.h similarity index 100% rename from harbour/src/3rd/jpeg/jpegint.h rename to src/3rd/jpeg/jpegint.h diff --git a/harbour/src/3rd/jpeg/jpeglib.h b/src/3rd/jpeg/jpeglib.h similarity index 100% rename from harbour/src/3rd/jpeg/jpeglib.h rename to src/3rd/jpeg/jpeglib.h diff --git a/harbour/src/3rd/jpeg/jquant1.c b/src/3rd/jpeg/jquant1.c similarity index 100% rename from harbour/src/3rd/jpeg/jquant1.c rename to src/3rd/jpeg/jquant1.c diff --git a/harbour/src/3rd/jpeg/jquant2.c b/src/3rd/jpeg/jquant2.c similarity index 100% rename from harbour/src/3rd/jpeg/jquant2.c rename to src/3rd/jpeg/jquant2.c diff --git a/harbour/src/3rd/jpeg/jutils.c b/src/3rd/jpeg/jutils.c similarity index 100% rename from harbour/src/3rd/jpeg/jutils.c rename to src/3rd/jpeg/jutils.c diff --git a/harbour/src/3rd/jpeg/jversion.h b/src/3rd/jpeg/jversion.h similarity index 100% rename from harbour/src/3rd/jpeg/jversion.h rename to src/3rd/jpeg/jversion.h diff --git a/harbour/src/3rd/jpeg/rdbmp.c b/src/3rd/jpeg/rdbmp.c similarity index 100% rename from harbour/src/3rd/jpeg/rdbmp.c rename to src/3rd/jpeg/rdbmp.c diff --git a/harbour/src/3rd/jpeg/rdcolmap.c b/src/3rd/jpeg/rdcolmap.c similarity index 100% rename from harbour/src/3rd/jpeg/rdcolmap.c rename to src/3rd/jpeg/rdcolmap.c diff --git a/harbour/src/3rd/jpeg/rdgif.c b/src/3rd/jpeg/rdgif.c similarity index 100% rename from harbour/src/3rd/jpeg/rdgif.c rename to src/3rd/jpeg/rdgif.c diff --git a/harbour/src/3rd/jpeg/rdppm.c b/src/3rd/jpeg/rdppm.c similarity index 100% rename from harbour/src/3rd/jpeg/rdppm.c rename to src/3rd/jpeg/rdppm.c diff --git a/harbour/src/3rd/jpeg/rdrle.c b/src/3rd/jpeg/rdrle.c similarity index 100% rename from harbour/src/3rd/jpeg/rdrle.c rename to src/3rd/jpeg/rdrle.c diff --git a/harbour/src/3rd/jpeg/rdswitch.c b/src/3rd/jpeg/rdswitch.c similarity index 100% rename from harbour/src/3rd/jpeg/rdswitch.c rename to src/3rd/jpeg/rdswitch.c diff --git a/harbour/src/3rd/jpeg/rdtarga.c b/src/3rd/jpeg/rdtarga.c similarity index 100% rename from harbour/src/3rd/jpeg/rdtarga.c rename to src/3rd/jpeg/rdtarga.c diff --git a/harbour/src/3rd/jpeg/transupp.c b/src/3rd/jpeg/transupp.c similarity index 100% rename from harbour/src/3rd/jpeg/transupp.c rename to src/3rd/jpeg/transupp.c diff --git a/harbour/src/3rd/jpeg/transupp.h b/src/3rd/jpeg/transupp.h similarity index 100% rename from harbour/src/3rd/jpeg/transupp.h rename to src/3rd/jpeg/transupp.h diff --git a/harbour/src/3rd/jpeg/wrbmp.c b/src/3rd/jpeg/wrbmp.c similarity index 100% rename from harbour/src/3rd/jpeg/wrbmp.c rename to src/3rd/jpeg/wrbmp.c diff --git a/harbour/src/3rd/jpeg/wrgif.c b/src/3rd/jpeg/wrgif.c similarity index 100% rename from harbour/src/3rd/jpeg/wrgif.c rename to src/3rd/jpeg/wrgif.c diff --git a/harbour/src/3rd/jpeg/wrppm.c b/src/3rd/jpeg/wrppm.c similarity index 100% rename from harbour/src/3rd/jpeg/wrppm.c rename to src/3rd/jpeg/wrppm.c diff --git a/harbour/src/3rd/jpeg/wrrle.c b/src/3rd/jpeg/wrrle.c similarity index 100% rename from harbour/src/3rd/jpeg/wrrle.c rename to src/3rd/jpeg/wrrle.c diff --git a/harbour/src/3rd/jpeg/wrtarga.c b/src/3rd/jpeg/wrtarga.c similarity index 100% rename from harbour/src/3rd/jpeg/wrtarga.c rename to src/3rd/jpeg/wrtarga.c diff --git a/harbour/src/3rd/pcre/LICENCE b/src/3rd/pcre/LICENCE similarity index 100% rename from harbour/src/3rd/pcre/LICENCE rename to src/3rd/pcre/LICENCE diff --git a/harbour/src/3rd/pcre/Makefile b/src/3rd/pcre/Makefile similarity index 100% rename from harbour/src/3rd/pcre/Makefile rename to src/3rd/pcre/Makefile diff --git a/harbour/src/3rd/pcre/chartabs.c b/src/3rd/pcre/chartabs.c similarity index 100% rename from harbour/src/3rd/pcre/chartabs.c rename to src/3rd/pcre/chartabs.c diff --git a/harbour/src/3rd/pcre/config.h b/src/3rd/pcre/config.h similarity index 100% rename from harbour/src/3rd/pcre/config.h rename to src/3rd/pcre/config.h diff --git a/harbour/src/3rd/pcre/pcre.dif b/src/3rd/pcre/pcre.dif similarity index 100% rename from harbour/src/3rd/pcre/pcre.dif rename to src/3rd/pcre/pcre.dif diff --git a/harbour/src/3rd/pcre/pcre.h b/src/3rd/pcre/pcre.h similarity index 100% rename from harbour/src/3rd/pcre/pcre.h rename to src/3rd/pcre/pcre.h diff --git a/harbour/src/3rd/pcre/pcrebyte.c b/src/3rd/pcre/pcrebyte.c similarity index 100% rename from harbour/src/3rd/pcre/pcrebyte.c rename to src/3rd/pcre/pcrebyte.c diff --git a/harbour/src/3rd/pcre/pcrecomp.c b/src/3rd/pcre/pcrecomp.c similarity index 100% rename from harbour/src/3rd/pcre/pcrecomp.c rename to src/3rd/pcre/pcrecomp.c diff --git a/harbour/src/3rd/pcre/pcreconf.c b/src/3rd/pcre/pcreconf.c similarity index 100% rename from harbour/src/3rd/pcre/pcreconf.c rename to src/3rd/pcre/pcreconf.c diff --git a/harbour/src/3rd/pcre/pcredfa.c b/src/3rd/pcre/pcredfa.c similarity index 100% rename from harbour/src/3rd/pcre/pcredfa.c rename to src/3rd/pcre/pcredfa.c diff --git a/harbour/src/3rd/pcre/pcreexec.c b/src/3rd/pcre/pcreexec.c similarity index 100% rename from harbour/src/3rd/pcre/pcreexec.c rename to src/3rd/pcre/pcreexec.c diff --git a/harbour/src/3rd/pcre/pcrefinf.c b/src/3rd/pcre/pcrefinf.c similarity index 100% rename from harbour/src/3rd/pcre/pcrefinf.c rename to src/3rd/pcre/pcrefinf.c diff --git a/harbour/src/3rd/pcre/pcreget.c b/src/3rd/pcre/pcreget.c similarity index 100% rename from harbour/src/3rd/pcre/pcreget.c rename to src/3rd/pcre/pcreget.c diff --git a/harbour/src/3rd/pcre/pcreglob.c b/src/3rd/pcre/pcreglob.c similarity index 100% rename from harbour/src/3rd/pcre/pcreglob.c rename to src/3rd/pcre/pcreglob.c diff --git a/harbour/src/3rd/pcre/pcreinal.h b/src/3rd/pcre/pcreinal.h similarity index 100% rename from harbour/src/3rd/pcre/pcreinal.h rename to src/3rd/pcre/pcreinal.h diff --git a/harbour/src/3rd/pcre/pcrejitc.c b/src/3rd/pcre/pcrejitc.c similarity index 100% rename from harbour/src/3rd/pcre/pcrejitc.c rename to src/3rd/pcre/pcrejitc.c diff --git a/harbour/src/3rd/pcre/pcremktb.c b/src/3rd/pcre/pcremktb.c similarity index 100% rename from harbour/src/3rd/pcre/pcremktb.c rename to src/3rd/pcre/pcremktb.c diff --git a/harbour/src/3rd/pcre/pcrenewl.c b/src/3rd/pcre/pcrenewl.c similarity index 100% rename from harbour/src/3rd/pcre/pcrenewl.c rename to src/3rd/pcre/pcrenewl.c diff --git a/harbour/src/3rd/pcre/pcreoutf.c b/src/3rd/pcre/pcreoutf.c similarity index 100% rename from harbour/src/3rd/pcre/pcreoutf.c rename to src/3rd/pcre/pcreoutf.c diff --git a/harbour/src/3rd/pcre/pcreprni.c b/src/3rd/pcre/pcreprni.c similarity index 100% rename from harbour/src/3rd/pcre/pcreprni.c rename to src/3rd/pcre/pcreprni.c diff --git a/harbour/src/3rd/pcre/pcrerefc.c b/src/3rd/pcre/pcrerefc.c similarity index 100% rename from harbour/src/3rd/pcre/pcrerefc.c rename to src/3rd/pcre/pcrerefc.c diff --git a/harbour/src/3rd/pcre/pcrestud.c b/src/3rd/pcre/pcrestud.c similarity index 100% rename from harbour/src/3rd/pcre/pcrestud.c rename to src/3rd/pcre/pcrestud.c diff --git a/harbour/src/3rd/pcre/pcretabs.c b/src/3rd/pcre/pcretabs.c similarity index 100% rename from harbour/src/3rd/pcre/pcretabs.c rename to src/3rd/pcre/pcretabs.c diff --git a/harbour/src/3rd/pcre/pcreucd.c b/src/3rd/pcre/pcreucd.c similarity index 100% rename from harbour/src/3rd/pcre/pcreucd.c rename to src/3rd/pcre/pcreucd.c diff --git a/harbour/src/3rd/pcre/pcrever.c b/src/3rd/pcre/pcrever.c similarity index 100% rename from harbour/src/3rd/pcre/pcrever.c rename to src/3rd/pcre/pcrever.c diff --git a/harbour/src/3rd/pcre/pcrevutf.c b/src/3rd/pcre/pcrevutf.c similarity index 100% rename from harbour/src/3rd/pcre/pcrevutf.c rename to src/3rd/pcre/pcrevutf.c diff --git a/harbour/src/3rd/pcre/pcrexcls.c b/src/3rd/pcre/pcrexcls.c similarity index 100% rename from harbour/src/3rd/pcre/pcrexcls.c rename to src/3rd/pcre/pcrexcls.c diff --git a/harbour/src/3rd/pcre/sjarmth2.c b/src/3rd/pcre/sjarmth2.c similarity index 100% rename from harbour/src/3rd/pcre/sjarmth2.c rename to src/3rd/pcre/sjarmth2.c diff --git a/harbour/src/3rd/pcre/sjarmv5.c b/src/3rd/pcre/sjarmv5.c similarity index 100% rename from harbour/src/3rd/pcre/sjarmv5.c rename to src/3rd/pcre/sjarmv5.c diff --git a/harbour/src/3rd/pcre/sjconf.h b/src/3rd/pcre/sjconf.h similarity index 100% rename from harbour/src/3rd/pcre/sjconf.h rename to src/3rd/pcre/sjconf.h diff --git a/harbour/src/3rd/pcre/sjconfi.h b/src/3rd/pcre/sjconfi.h similarity index 100% rename from harbour/src/3rd/pcre/sjconfi.h rename to src/3rd/pcre/sjconfi.h diff --git a/harbour/src/3rd/pcre/sjexeca.c b/src/3rd/pcre/sjexeca.c similarity index 100% rename from harbour/src/3rd/pcre/sjexeca.c rename to src/3rd/pcre/sjexeca.c diff --git a/harbour/src/3rd/pcre/sjlir.c b/src/3rd/pcre/sjlir.c similarity index 100% rename from harbour/src/3rd/pcre/sjlir.c rename to src/3rd/pcre/sjlir.c diff --git a/harbour/src/3rd/pcre/sjlir.h b/src/3rd/pcre/sjlir.h similarity index 100% rename from harbour/src/3rd/pcre/sjlir.h rename to src/3rd/pcre/sjlir.h diff --git a/harbour/src/3rd/pcre/sjmips32.c b/src/3rd/pcre/sjmips32.c similarity index 100% rename from harbour/src/3rd/pcre/sjmips32.c rename to src/3rd/pcre/sjmips32.c diff --git a/harbour/src/3rd/pcre/sjmipsc.c b/src/3rd/pcre/sjmipsc.c similarity index 100% rename from harbour/src/3rd/pcre/sjmipsc.c rename to src/3rd/pcre/sjmipsc.c diff --git a/harbour/src/3rd/pcre/sjppc32.c b/src/3rd/pcre/sjppc32.c similarity index 100% rename from harbour/src/3rd/pcre/sjppc32.c rename to src/3rd/pcre/sjppc32.c diff --git a/harbour/src/3rd/pcre/sjppc64.c b/src/3rd/pcre/sjppc64.c similarity index 100% rename from harbour/src/3rd/pcre/sjppc64.c rename to src/3rd/pcre/sjppc64.c diff --git a/harbour/src/3rd/pcre/sjppcc.c b/src/3rd/pcre/sjppcc.c similarity index 100% rename from harbour/src/3rd/pcre/sjppcc.c rename to src/3rd/pcre/sjppcc.c diff --git a/harbour/src/3rd/pcre/sjutils.c b/src/3rd/pcre/sjutils.c similarity index 100% rename from harbour/src/3rd/pcre/sjutils.c rename to src/3rd/pcre/sjutils.c diff --git a/harbour/src/3rd/pcre/sjx8632.c b/src/3rd/pcre/sjx8632.c similarity index 100% rename from harbour/src/3rd/pcre/sjx8632.c rename to src/3rd/pcre/sjx8632.c diff --git a/harbour/src/3rd/pcre/sjx8664.c b/src/3rd/pcre/sjx8664.c similarity index 100% rename from harbour/src/3rd/pcre/sjx8664.c rename to src/3rd/pcre/sjx8664.c diff --git a/harbour/src/3rd/pcre/sjx86c.c b/src/3rd/pcre/sjx86c.c similarity index 100% rename from harbour/src/3rd/pcre/sjx86c.c rename to src/3rd/pcre/sjx86c.c diff --git a/harbour/src/3rd/pcre/ucp.h b/src/3rd/pcre/ucp.h similarity index 100% rename from harbour/src/3rd/pcre/ucp.h rename to src/3rd/pcre/ucp.h diff --git a/harbour/src/3rd/png/LICENSE b/src/3rd/png/LICENSE similarity index 100% rename from harbour/src/3rd/png/LICENSE rename to src/3rd/png/LICENSE diff --git a/harbour/src/3rd/png/Makefile b/src/3rd/png/Makefile similarity index 100% rename from harbour/src/3rd/png/Makefile rename to src/3rd/png/Makefile diff --git a/harbour/src/3rd/png/png.c b/src/3rd/png/png.c similarity index 100% rename from harbour/src/3rd/png/png.c rename to src/3rd/png/png.c diff --git a/harbour/src/3rd/png/png.dif b/src/3rd/png/png.dif similarity index 100% rename from harbour/src/3rd/png/png.dif rename to src/3rd/png/png.dif diff --git a/harbour/src/3rd/png/png.h b/src/3rd/png/png.h similarity index 100% rename from harbour/src/3rd/png/png.h rename to src/3rd/png/png.h diff --git a/harbour/src/3rd/png/pngconf.h b/src/3rd/png/pngconf.h similarity index 100% rename from harbour/src/3rd/png/pngconf.h rename to src/3rd/png/pngconf.h diff --git a/harbour/src/3rd/png/pngdebug.h b/src/3rd/png/pngdebug.h similarity index 100% rename from harbour/src/3rd/png/pngdebug.h rename to src/3rd/png/pngdebug.h diff --git a/harbour/src/3rd/png/pngerror.c b/src/3rd/png/pngerror.c similarity index 100% rename from harbour/src/3rd/png/pngerror.c rename to src/3rd/png/pngerror.c diff --git a/harbour/src/3rd/png/pngget.c b/src/3rd/png/pngget.c similarity index 100% rename from harbour/src/3rd/png/pngget.c rename to src/3rd/png/pngget.c diff --git a/harbour/src/3rd/png/pnginfo.h b/src/3rd/png/pnginfo.h similarity index 100% rename from harbour/src/3rd/png/pnginfo.h rename to src/3rd/png/pnginfo.h diff --git a/harbour/src/3rd/png/pnglconf.h b/src/3rd/png/pnglconf.h similarity index 100% rename from harbour/src/3rd/png/pnglconf.h rename to src/3rd/png/pnglconf.h diff --git a/harbour/src/3rd/png/pngmem.c b/src/3rd/png/pngmem.c similarity index 100% rename from harbour/src/3rd/png/pngmem.c rename to src/3rd/png/pngmem.c diff --git a/harbour/src/3rd/png/pngpread.c b/src/3rd/png/pngpread.c similarity index 100% rename from harbour/src/3rd/png/pngpread.c rename to src/3rd/png/pngpread.c diff --git a/harbour/src/3rd/png/pngpriv.h b/src/3rd/png/pngpriv.h similarity index 100% rename from harbour/src/3rd/png/pngpriv.h rename to src/3rd/png/pngpriv.h diff --git a/harbour/src/3rd/png/pngread.c b/src/3rd/png/pngread.c similarity index 100% rename from harbour/src/3rd/png/pngread.c rename to src/3rd/png/pngread.c diff --git a/harbour/src/3rd/png/pngrio.c b/src/3rd/png/pngrio.c similarity index 100% rename from harbour/src/3rd/png/pngrio.c rename to src/3rd/png/pngrio.c diff --git a/harbour/src/3rd/png/pngrtran.c b/src/3rd/png/pngrtran.c similarity index 100% rename from harbour/src/3rd/png/pngrtran.c rename to src/3rd/png/pngrtran.c diff --git a/harbour/src/3rd/png/pngrutil.c b/src/3rd/png/pngrutil.c similarity index 100% rename from harbour/src/3rd/png/pngrutil.c rename to src/3rd/png/pngrutil.c diff --git a/harbour/src/3rd/png/pngset.c b/src/3rd/png/pngset.c similarity index 100% rename from harbour/src/3rd/png/pngset.c rename to src/3rd/png/pngset.c diff --git a/harbour/src/3rd/png/pngstru.h b/src/3rd/png/pngstru.h similarity index 100% rename from harbour/src/3rd/png/pngstru.h rename to src/3rd/png/pngstru.h diff --git a/harbour/src/3rd/png/pngtrans.c b/src/3rd/png/pngtrans.c similarity index 100% rename from harbour/src/3rd/png/pngtrans.c rename to src/3rd/png/pngtrans.c diff --git a/harbour/src/3rd/png/pngwio.c b/src/3rd/png/pngwio.c similarity index 100% rename from harbour/src/3rd/png/pngwio.c rename to src/3rd/png/pngwio.c diff --git a/harbour/src/3rd/png/pngwrite.c b/src/3rd/png/pngwrite.c similarity index 100% rename from harbour/src/3rd/png/pngwrite.c rename to src/3rd/png/pngwrite.c diff --git a/harbour/src/3rd/png/pngwtran.c b/src/3rd/png/pngwtran.c similarity index 100% rename from harbour/src/3rd/png/pngwtran.c rename to src/3rd/png/pngwtran.c diff --git a/harbour/src/3rd/png/pngwutil.c b/src/3rd/png/pngwutil.c similarity index 100% rename from harbour/src/3rd/png/pngwutil.c rename to src/3rd/png/pngwutil.c diff --git a/harbour/src/3rd/tiff/LICENSE b/src/3rd/tiff/LICENSE similarity index 100% rename from harbour/src/3rd/tiff/LICENSE rename to src/3rd/tiff/LICENSE diff --git a/harbour/src/3rd/tiff/Makefile b/src/3rd/tiff/Makefile similarity index 100% rename from harbour/src/3rd/tiff/Makefile rename to src/3rd/tiff/Makefile diff --git a/harbour/src/3rd/tiff/auxtif.c b/src/3rd/tiff/auxtif.c similarity index 100% rename from harbour/src/3rd/tiff/auxtif.c rename to src/3rd/tiff/auxtif.c diff --git a/harbour/src/3rd/tiff/close.c b/src/3rd/tiff/close.c similarity index 100% rename from harbour/src/3rd/tiff/close.c rename to src/3rd/tiff/close.c diff --git a/harbour/src/3rd/tiff/codec.c b/src/3rd/tiff/codec.c similarity index 100% rename from harbour/src/3rd/tiff/codec.c rename to src/3rd/tiff/codec.c diff --git a/harbour/src/3rd/tiff/color.c b/src/3rd/tiff/color.c similarity index 100% rename from harbour/src/3rd/tiff/color.c rename to src/3rd/tiff/color.c diff --git a/harbour/src/3rd/tiff/compress.c b/src/3rd/tiff/compress.c similarity index 100% rename from harbour/src/3rd/tiff/compress.c rename to src/3rd/tiff/compress.c diff --git a/harbour/src/3rd/tiff/dir.c b/src/3rd/tiff/dir.c similarity index 100% rename from harbour/src/3rd/tiff/dir.c rename to src/3rd/tiff/dir.c diff --git a/harbour/src/3rd/tiff/dir.h b/src/3rd/tiff/dir.h similarity index 100% rename from harbour/src/3rd/tiff/dir.h rename to src/3rd/tiff/dir.h diff --git a/harbour/src/3rd/tiff/dirinfo.c b/src/3rd/tiff/dirinfo.c similarity index 100% rename from harbour/src/3rd/tiff/dirinfo.c rename to src/3rd/tiff/dirinfo.c diff --git a/harbour/src/3rd/tiff/dirread.c b/src/3rd/tiff/dirread.c similarity index 100% rename from harbour/src/3rd/tiff/dirread.c rename to src/3rd/tiff/dirread.c diff --git a/harbour/src/3rd/tiff/dirwrite.c b/src/3rd/tiff/dirwrite.c similarity index 100% rename from harbour/src/3rd/tiff/dirwrite.c rename to src/3rd/tiff/dirwrite.c diff --git a/harbour/src/3rd/tiff/dumpmode.c b/src/3rd/tiff/dumpmode.c similarity index 100% rename from harbour/src/3rd/tiff/dumpmode.c rename to src/3rd/tiff/dumpmode.c diff --git a/harbour/src/3rd/tiff/error.c b/src/3rd/tiff/error.c similarity index 100% rename from harbour/src/3rd/tiff/error.c rename to src/3rd/tiff/error.c diff --git a/harbour/src/3rd/tiff/extensio.c b/src/3rd/tiff/extensio.c similarity index 100% rename from harbour/src/3rd/tiff/extensio.c rename to src/3rd/tiff/extensio.c diff --git a/harbour/src/3rd/tiff/fax3.c b/src/3rd/tiff/fax3.c similarity index 100% rename from harbour/src/3rd/tiff/fax3.c rename to src/3rd/tiff/fax3.c diff --git a/harbour/src/3rd/tiff/fax3.h b/src/3rd/tiff/fax3.h similarity index 100% rename from harbour/src/3rd/tiff/fax3.h rename to src/3rd/tiff/fax3.h diff --git a/harbour/src/3rd/tiff/fax3sm.c b/src/3rd/tiff/fax3sm.c similarity index 100% rename from harbour/src/3rd/tiff/fax3sm.c rename to src/3rd/tiff/fax3sm.c diff --git a/harbour/src/3rd/tiff/flush.c b/src/3rd/tiff/flush.c similarity index 100% rename from harbour/src/3rd/tiff/flush.c rename to src/3rd/tiff/flush.c diff --git a/harbour/src/3rd/tiff/getimage.c b/src/3rd/tiff/getimage.c similarity index 100% rename from harbour/src/3rd/tiff/getimage.c rename to src/3rd/tiff/getimage.c diff --git a/harbour/src/3rd/tiff/jbig.c b/src/3rd/tiff/jbig.c similarity index 100% rename from harbour/src/3rd/tiff/jbig.c rename to src/3rd/tiff/jbig.c diff --git a/harbour/src/3rd/tiff/jpeg.c b/src/3rd/tiff/jpeg.c similarity index 100% rename from harbour/src/3rd/tiff/jpeg.c rename to src/3rd/tiff/jpeg.c diff --git a/harbour/src/3rd/tiff/jpeg_12.c b/src/3rd/tiff/jpeg_12.c similarity index 100% rename from harbour/src/3rd/tiff/jpeg_12.c rename to src/3rd/tiff/jpeg_12.c diff --git a/harbour/src/3rd/tiff/luv.c b/src/3rd/tiff/luv.c similarity index 100% rename from harbour/src/3rd/tiff/luv.c rename to src/3rd/tiff/luv.c diff --git a/harbour/src/3rd/tiff/lzma.c b/src/3rd/tiff/lzma.c similarity index 100% rename from harbour/src/3rd/tiff/lzma.c rename to src/3rd/tiff/lzma.c diff --git a/harbour/src/3rd/tiff/lzw.c b/src/3rd/tiff/lzw.c similarity index 100% rename from harbour/src/3rd/tiff/lzw.c rename to src/3rd/tiff/lzw.c diff --git a/harbour/src/3rd/tiff/next.c b/src/3rd/tiff/next.c similarity index 100% rename from harbour/src/3rd/tiff/next.c rename to src/3rd/tiff/next.c diff --git a/harbour/src/3rd/tiff/ojpeg.c b/src/3rd/tiff/ojpeg.c similarity index 100% rename from harbour/src/3rd/tiff/ojpeg.c rename to src/3rd/tiff/ojpeg.c diff --git a/harbour/src/3rd/tiff/open.c b/src/3rd/tiff/open.c similarity index 100% rename from harbour/src/3rd/tiff/open.c rename to src/3rd/tiff/open.c diff --git a/harbour/src/3rd/tiff/packbits.c b/src/3rd/tiff/packbits.c similarity index 100% rename from harbour/src/3rd/tiff/packbits.c rename to src/3rd/tiff/packbits.c diff --git a/harbour/src/3rd/tiff/pixarlog.c b/src/3rd/tiff/pixarlog.c similarity index 100% rename from harbour/src/3rd/tiff/pixarlog.c rename to src/3rd/tiff/pixarlog.c diff --git a/harbour/src/3rd/tiff/predict.c b/src/3rd/tiff/predict.c similarity index 100% rename from harbour/src/3rd/tiff/predict.c rename to src/3rd/tiff/predict.c diff --git a/harbour/src/3rd/tiff/predict.h b/src/3rd/tiff/predict.h similarity index 100% rename from harbour/src/3rd/tiff/predict.h rename to src/3rd/tiff/predict.h diff --git a/harbour/src/3rd/tiff/print.c b/src/3rd/tiff/print.c similarity index 100% rename from harbour/src/3rd/tiff/print.c rename to src/3rd/tiff/print.c diff --git a/harbour/src/3rd/tiff/read.c b/src/3rd/tiff/read.c similarity index 100% rename from harbour/src/3rd/tiff/read.c rename to src/3rd/tiff/read.c diff --git a/harbour/src/3rd/tiff/strip.c b/src/3rd/tiff/strip.c similarity index 100% rename from harbour/src/3rd/tiff/strip.c rename to src/3rd/tiff/strip.c diff --git a/harbour/src/3rd/tiff/swab.c b/src/3rd/tiff/swab.c similarity index 100% rename from harbour/src/3rd/tiff/swab.c rename to src/3rd/tiff/swab.c diff --git a/harbour/src/3rd/tiff/t4.h b/src/3rd/tiff/t4.h similarity index 100% rename from harbour/src/3rd/tiff/t4.h rename to src/3rd/tiff/t4.h diff --git a/harbour/src/3rd/tiff/thunder.c b/src/3rd/tiff/thunder.c similarity index 100% rename from harbour/src/3rd/tiff/thunder.c rename to src/3rd/tiff/thunder.c diff --git a/harbour/src/3rd/tiff/tiff.dif b/src/3rd/tiff/tiff.dif similarity index 100% rename from harbour/src/3rd/tiff/tiff.dif rename to src/3rd/tiff/tiff.dif diff --git a/harbour/src/3rd/tiff/tiff.h b/src/3rd/tiff/tiff.h similarity index 100% rename from harbour/src/3rd/tiff/tiff.h rename to src/3rd/tiff/tiff.h diff --git a/harbour/src/3rd/tiff/tiffconf.h b/src/3rd/tiff/tiffconf.h similarity index 100% rename from harbour/src/3rd/tiff/tiffconf.h rename to src/3rd/tiff/tiffconf.h diff --git a/harbour/src/3rd/tiff/tiffio.h b/src/3rd/tiff/tiffio.h similarity index 100% rename from harbour/src/3rd/tiff/tiffio.h rename to src/3rd/tiff/tiffio.h diff --git a/harbour/src/3rd/tiff/tiffiop.h b/src/3rd/tiff/tiffiop.h similarity index 100% rename from harbour/src/3rd/tiff/tiffiop.h rename to src/3rd/tiff/tiffiop.h diff --git a/harbour/src/3rd/tiff/tiffvers.h b/src/3rd/tiff/tiffvers.h similarity index 100% rename from harbour/src/3rd/tiff/tiffvers.h rename to src/3rd/tiff/tiffvers.h diff --git a/harbour/src/3rd/tiff/tile.c b/src/3rd/tiff/tile.c similarity index 100% rename from harbour/src/3rd/tiff/tile.c rename to src/3rd/tiff/tile.c diff --git a/harbour/src/3rd/tiff/unix.c b/src/3rd/tiff/unix.c similarity index 100% rename from harbour/src/3rd/tiff/unix.c rename to src/3rd/tiff/unix.c diff --git a/harbour/src/3rd/tiff/uvcode.h b/src/3rd/tiff/uvcode.h similarity index 100% rename from harbour/src/3rd/tiff/uvcode.h rename to src/3rd/tiff/uvcode.h diff --git a/harbour/src/3rd/tiff/version.c b/src/3rd/tiff/version.c similarity index 100% rename from harbour/src/3rd/tiff/version.c rename to src/3rd/tiff/version.c diff --git a/harbour/src/3rd/tiff/warn.c b/src/3rd/tiff/warn.c similarity index 100% rename from harbour/src/3rd/tiff/warn.c rename to src/3rd/tiff/warn.c diff --git a/harbour/src/3rd/tiff/win32.c b/src/3rd/tiff/win32.c similarity index 100% rename from harbour/src/3rd/tiff/win32.c rename to src/3rd/tiff/win32.c diff --git a/harbour/src/3rd/tiff/write.c b/src/3rd/tiff/write.c similarity index 100% rename from harbour/src/3rd/tiff/write.c rename to src/3rd/tiff/write.c diff --git a/harbour/src/3rd/tiff/zip.c b/src/3rd/tiff/zip.c similarity index 100% rename from harbour/src/3rd/tiff/zip.c rename to src/3rd/tiff/zip.c diff --git a/harbour/src/3rd/zlib/ChangeLog b/src/3rd/zlib/ChangeLog similarity index 100% rename from harbour/src/3rd/zlib/ChangeLog rename to src/3rd/zlib/ChangeLog diff --git a/harbour/src/3rd/zlib/Makefile b/src/3rd/zlib/Makefile similarity index 100% rename from harbour/src/3rd/zlib/Makefile rename to src/3rd/zlib/Makefile diff --git a/harbour/src/3rd/zlib/README b/src/3rd/zlib/README similarity index 100% rename from harbour/src/3rd/zlib/README rename to src/3rd/zlib/README diff --git a/harbour/src/3rd/zlib/adler32.c b/src/3rd/zlib/adler32.c similarity index 100% rename from harbour/src/3rd/zlib/adler32.c rename to src/3rd/zlib/adler32.c diff --git a/harbour/src/3rd/zlib/compress.c b/src/3rd/zlib/compress.c similarity index 100% rename from harbour/src/3rd/zlib/compress.c rename to src/3rd/zlib/compress.c diff --git a/harbour/src/3rd/zlib/crc32.c b/src/3rd/zlib/crc32.c similarity index 100% rename from harbour/src/3rd/zlib/crc32.c rename to src/3rd/zlib/crc32.c diff --git a/harbour/src/3rd/zlib/crc32.h b/src/3rd/zlib/crc32.h similarity index 100% rename from harbour/src/3rd/zlib/crc32.h rename to src/3rd/zlib/crc32.h diff --git a/harbour/src/3rd/zlib/deflate.c b/src/3rd/zlib/deflate.c similarity index 100% rename from harbour/src/3rd/zlib/deflate.c rename to src/3rd/zlib/deflate.c diff --git a/harbour/src/3rd/zlib/deflate.h b/src/3rd/zlib/deflate.h similarity index 100% rename from harbour/src/3rd/zlib/deflate.h rename to src/3rd/zlib/deflate.h diff --git a/harbour/src/3rd/zlib/gzclose.c b/src/3rd/zlib/gzclose.c similarity index 100% rename from harbour/src/3rd/zlib/gzclose.c rename to src/3rd/zlib/gzclose.c diff --git a/harbour/src/3rd/zlib/gzguts.h b/src/3rd/zlib/gzguts.h similarity index 100% rename from harbour/src/3rd/zlib/gzguts.h rename to src/3rd/zlib/gzguts.h diff --git a/harbour/src/3rd/zlib/gzlib.c b/src/3rd/zlib/gzlib.c similarity index 100% rename from harbour/src/3rd/zlib/gzlib.c rename to src/3rd/zlib/gzlib.c diff --git a/harbour/src/3rd/zlib/gzread.c b/src/3rd/zlib/gzread.c similarity index 100% rename from harbour/src/3rd/zlib/gzread.c rename to src/3rd/zlib/gzread.c diff --git a/harbour/src/3rd/zlib/gzwrite.c b/src/3rd/zlib/gzwrite.c similarity index 100% rename from harbour/src/3rd/zlib/gzwrite.c rename to src/3rd/zlib/gzwrite.c diff --git a/harbour/src/3rd/zlib/infback.c b/src/3rd/zlib/infback.c similarity index 100% rename from harbour/src/3rd/zlib/infback.c rename to src/3rd/zlib/infback.c diff --git a/harbour/src/3rd/zlib/inffast.c b/src/3rd/zlib/inffast.c similarity index 100% rename from harbour/src/3rd/zlib/inffast.c rename to src/3rd/zlib/inffast.c diff --git a/harbour/src/3rd/zlib/inffast.h b/src/3rd/zlib/inffast.h similarity index 100% rename from harbour/src/3rd/zlib/inffast.h rename to src/3rd/zlib/inffast.h diff --git a/harbour/src/3rd/zlib/inffixed.h b/src/3rd/zlib/inffixed.h similarity index 100% rename from harbour/src/3rd/zlib/inffixed.h rename to src/3rd/zlib/inffixed.h diff --git a/harbour/src/3rd/zlib/inflate.c b/src/3rd/zlib/inflate.c similarity index 100% rename from harbour/src/3rd/zlib/inflate.c rename to src/3rd/zlib/inflate.c diff --git a/harbour/src/3rd/zlib/inflate.h b/src/3rd/zlib/inflate.h similarity index 100% rename from harbour/src/3rd/zlib/inflate.h rename to src/3rd/zlib/inflate.h diff --git a/harbour/src/3rd/zlib/inftrees.c b/src/3rd/zlib/inftrees.c similarity index 100% rename from harbour/src/3rd/zlib/inftrees.c rename to src/3rd/zlib/inftrees.c diff --git a/harbour/src/3rd/zlib/inftrees.h b/src/3rd/zlib/inftrees.h similarity index 100% rename from harbour/src/3rd/zlib/inftrees.h rename to src/3rd/zlib/inftrees.h diff --git a/harbour/src/3rd/zlib/trees.c b/src/3rd/zlib/trees.c similarity index 100% rename from harbour/src/3rd/zlib/trees.c rename to src/3rd/zlib/trees.c diff --git a/harbour/src/3rd/zlib/trees.h b/src/3rd/zlib/trees.h similarity index 100% rename from harbour/src/3rd/zlib/trees.h rename to src/3rd/zlib/trees.h diff --git a/harbour/src/3rd/zlib/uncompr.c b/src/3rd/zlib/uncompr.c similarity index 100% rename from harbour/src/3rd/zlib/uncompr.c rename to src/3rd/zlib/uncompr.c diff --git a/harbour/src/3rd/zlib/zconf.h b/src/3rd/zlib/zconf.h similarity index 100% rename from harbour/src/3rd/zlib/zconf.h rename to src/3rd/zlib/zconf.h diff --git a/harbour/src/3rd/zlib/zlib.dif b/src/3rd/zlib/zlib.dif similarity index 100% rename from harbour/src/3rd/zlib/zlib.dif rename to src/3rd/zlib/zlib.dif diff --git a/harbour/src/3rd/zlib/zlib.h b/src/3rd/zlib/zlib.h similarity index 100% rename from harbour/src/3rd/zlib/zlib.h rename to src/3rd/zlib/zlib.h diff --git a/harbour/src/3rd/zlib/zutil.c b/src/3rd/zlib/zutil.c similarity index 100% rename from harbour/src/3rd/zlib/zutil.c rename to src/3rd/zlib/zutil.c diff --git a/harbour/src/3rd/zlib/zutil.h b/src/3rd/zlib/zutil.h similarity index 100% rename from harbour/src/3rd/zlib/zutil.h rename to src/3rd/zlib/zutil.h diff --git a/harbour/src/Makefile b/src/Makefile similarity index 100% rename from harbour/src/Makefile rename to src/Makefile diff --git a/harbour/src/codepage/Makefile b/src/codepage/Makefile similarity index 100% rename from harbour/src/codepage/Makefile rename to src/codepage/Makefile diff --git a/harbour/src/codepage/big5.c b/src/codepage/big5.c similarity index 100% rename from harbour/src/codepage/big5.c rename to src/codepage/big5.c diff --git a/harbour/src/codepage/cp950.c b/src/codepage/cp950.c similarity index 100% rename from harbour/src/codepage/cp950.c rename to src/codepage/cp950.c diff --git a/harbour/src/codepage/cp_950.c b/src/codepage/cp_950.c similarity index 100% rename from harbour/src/codepage/cp_950.c rename to src/codepage/cp_950.c diff --git a/harbour/src/codepage/cp_big5.c b/src/codepage/cp_big5.c similarity index 100% rename from harbour/src/codepage/cp_big5.c rename to src/codepage/cp_big5.c diff --git a/harbour/src/codepage/cp_gbk.c b/src/codepage/cp_gbk.c similarity index 100% rename from harbour/src/codepage/cp_gbk.c rename to src/codepage/cp_gbk.c diff --git a/harbour/src/codepage/cp_tpl.c b/src/codepage/cp_tpl.c similarity index 100% rename from harbour/src/codepage/cp_tpl.c rename to src/codepage/cp_tpl.c diff --git a/harbour/src/codepage/cp_u16le.c b/src/codepage/cp_u16le.c similarity index 100% rename from harbour/src/codepage/cp_u16le.c rename to src/codepage/cp_u16le.c diff --git a/harbour/src/codepage/cp_utf8.c b/src/codepage/cp_utf8.c similarity index 100% rename from harbour/src/codepage/cp_utf8.c rename to src/codepage/cp_utf8.c diff --git a/harbour/src/codepage/cpbg866.c b/src/codepage/cpbg866.c similarity index 100% rename from harbour/src/codepage/cpbg866.c rename to src/codepage/cpbg866.c diff --git a/harbour/src/codepage/cpbgiso.c b/src/codepage/cpbgiso.c similarity index 100% rename from harbour/src/codepage/cpbgiso.c rename to src/codepage/cpbgiso.c diff --git a/harbour/src/codepage/cpbgmik.c b/src/codepage/cpbgmik.c similarity index 100% rename from harbour/src/codepage/cpbgmik.c rename to src/codepage/cpbgmik.c diff --git a/harbour/src/codepage/cpbgwin.c b/src/codepage/cpbgwin.c similarity index 100% rename from harbour/src/codepage/cpbgwin.c rename to src/codepage/cpbgwin.c diff --git a/harbour/src/codepage/cpcs852.c b/src/codepage/cpcs852.c similarity index 100% rename from harbour/src/codepage/cpcs852.c rename to src/codepage/cpcs852.c diff --git a/harbour/src/codepage/cpcs852c.c b/src/codepage/cpcs852c.c similarity index 100% rename from harbour/src/codepage/cpcs852c.c rename to src/codepage/cpcs852c.c diff --git a/harbour/src/codepage/cpcsiso.c b/src/codepage/cpcsiso.c similarity index 100% rename from harbour/src/codepage/cpcsiso.c rename to src/codepage/cpcsiso.c diff --git a/harbour/src/codepage/cpcskamc.c b/src/codepage/cpcskamc.c similarity index 100% rename from harbour/src/codepage/cpcskamc.c rename to src/codepage/cpcskamc.c diff --git a/harbour/src/codepage/cpcswin.c b/src/codepage/cpcswin.c similarity index 100% rename from harbour/src/codepage/cpcswin.c rename to src/codepage/cpcswin.c diff --git a/harbour/src/codepage/cpde850.c b/src/codepage/cpde850.c similarity index 100% rename from harbour/src/codepage/cpde850.c rename to src/codepage/cpde850.c diff --git a/harbour/src/codepage/cpde850m.c b/src/codepage/cpde850m.c similarity index 100% rename from harbour/src/codepage/cpde850m.c rename to src/codepage/cpde850m.c diff --git a/harbour/src/codepage/cpdeiso.c b/src/codepage/cpdeiso.c similarity index 100% rename from harbour/src/codepage/cpdeiso.c rename to src/codepage/cpdeiso.c diff --git a/harbour/src/codepage/cpdewin.c b/src/codepage/cpdewin.c similarity index 100% rename from harbour/src/codepage/cpdewin.c rename to src/codepage/cpdewin.c diff --git a/harbour/src/codepage/cpdk865.c b/src/codepage/cpdk865.c similarity index 100% rename from harbour/src/codepage/cpdk865.c rename to src/codepage/cpdk865.c diff --git a/harbour/src/codepage/cpel437.c b/src/codepage/cpel437.c similarity index 100% rename from harbour/src/codepage/cpel437.c rename to src/codepage/cpel437.c diff --git a/harbour/src/codepage/cpel737.c b/src/codepage/cpel737.c similarity index 100% rename from harbour/src/codepage/cpel737.c rename to src/codepage/cpel737.c diff --git a/harbour/src/codepage/cpeliso.c b/src/codepage/cpeliso.c similarity index 100% rename from harbour/src/codepage/cpeliso.c rename to src/codepage/cpeliso.c diff --git a/harbour/src/codepage/cpelwin.c b/src/codepage/cpelwin.c similarity index 100% rename from harbour/src/codepage/cpelwin.c rename to src/codepage/cpelwin.c diff --git a/harbour/src/codepage/cpes850.c b/src/codepage/cpes850.c similarity index 100% rename from harbour/src/codepage/cpes850.c rename to src/codepage/cpes850.c diff --git a/harbour/src/codepage/cpes850c.c b/src/codepage/cpes850c.c similarity index 100% rename from harbour/src/codepage/cpes850c.c rename to src/codepage/cpes850c.c diff --git a/harbour/src/codepage/cpes850m.c b/src/codepage/cpes850m.c similarity index 100% rename from harbour/src/codepage/cpes850m.c rename to src/codepage/cpes850m.c diff --git a/harbour/src/codepage/cpesiso.c b/src/codepage/cpesiso.c similarity index 100% rename from harbour/src/codepage/cpesiso.c rename to src/codepage/cpesiso.c diff --git a/harbour/src/codepage/cpesmwin.c b/src/codepage/cpesmwin.c similarity index 100% rename from harbour/src/codepage/cpesmwin.c rename to src/codepage/cpesmwin.c diff --git a/harbour/src/codepage/cpeswin.c b/src/codepage/cpeswin.c similarity index 100% rename from harbour/src/codepage/cpeswin.c rename to src/codepage/cpeswin.c diff --git a/harbour/src/codepage/cpfi850.c b/src/codepage/cpfi850.c similarity index 100% rename from harbour/src/codepage/cpfi850.c rename to src/codepage/cpfi850.c diff --git a/harbour/src/codepage/cpfr850.c b/src/codepage/cpfr850.c similarity index 100% rename from harbour/src/codepage/cpfr850.c rename to src/codepage/cpfr850.c diff --git a/harbour/src/codepage/cpfr850m.c b/src/codepage/cpfr850m.c similarity index 100% rename from harbour/src/codepage/cpfr850m.c rename to src/codepage/cpfr850m.c diff --git a/harbour/src/codepage/cpfriso.c b/src/codepage/cpfriso.c similarity index 100% rename from harbour/src/codepage/cpfriso.c rename to src/codepage/cpfriso.c diff --git a/harbour/src/codepage/cpfrwin.c b/src/codepage/cpfrwin.c similarity index 100% rename from harbour/src/codepage/cpfrwin.c rename to src/codepage/cpfrwin.c diff --git a/harbour/src/codepage/cphe862.c b/src/codepage/cphe862.c similarity index 100% rename from harbour/src/codepage/cphe862.c rename to src/codepage/cphe862.c diff --git a/harbour/src/codepage/cphewin.c b/src/codepage/cphewin.c similarity index 100% rename from harbour/src/codepage/cphewin.c rename to src/codepage/cphewin.c diff --git a/harbour/src/codepage/cphr646.c b/src/codepage/cphr646.c similarity index 100% rename from harbour/src/codepage/cphr646.c rename to src/codepage/cphr646.c diff --git a/harbour/src/codepage/cphr852.c b/src/codepage/cphr852.c similarity index 100% rename from harbour/src/codepage/cphr852.c rename to src/codepage/cphr852.c diff --git a/harbour/src/codepage/cphriso.c b/src/codepage/cphriso.c similarity index 100% rename from harbour/src/codepage/cphriso.c rename to src/codepage/cphriso.c diff --git a/harbour/src/codepage/cphrwin.c b/src/codepage/cphrwin.c similarity index 100% rename from harbour/src/codepage/cphrwin.c rename to src/codepage/cphrwin.c diff --git a/harbour/src/codepage/cphu852.c b/src/codepage/cphu852.c similarity index 100% rename from harbour/src/codepage/cphu852.c rename to src/codepage/cphu852.c diff --git a/harbour/src/codepage/cphu852c.c b/src/codepage/cphu852c.c similarity index 100% rename from harbour/src/codepage/cphu852c.c rename to src/codepage/cphu852c.c diff --git a/harbour/src/codepage/cphuiso.c b/src/codepage/cphuiso.c similarity index 100% rename from harbour/src/codepage/cphuiso.c rename to src/codepage/cphuiso.c diff --git a/harbour/src/codepage/cphuwin.c b/src/codepage/cphuwin.c similarity index 100% rename from harbour/src/codepage/cphuwin.c rename to src/codepage/cphuwin.c diff --git a/harbour/src/codepage/cpis850.c b/src/codepage/cpis850.c similarity index 100% rename from harbour/src/codepage/cpis850.c rename to src/codepage/cpis850.c diff --git a/harbour/src/codepage/cpis861.c b/src/codepage/cpis861.c similarity index 100% rename from harbour/src/codepage/cpis861.c rename to src/codepage/cpis861.c diff --git a/harbour/src/codepage/cpit437.c b/src/codepage/cpit437.c similarity index 100% rename from harbour/src/codepage/cpit437.c rename to src/codepage/cpit437.c diff --git a/harbour/src/codepage/cpit850.c b/src/codepage/cpit850.c similarity index 100% rename from harbour/src/codepage/cpit850.c rename to src/codepage/cpit850.c diff --git a/harbour/src/codepage/cpit850m.c b/src/codepage/cpit850m.c similarity index 100% rename from harbour/src/codepage/cpit850m.c rename to src/codepage/cpit850m.c diff --git a/harbour/src/codepage/cpitisb.c b/src/codepage/cpitisb.c similarity index 100% rename from harbour/src/codepage/cpitisb.c rename to src/codepage/cpitisb.c diff --git a/harbour/src/codepage/cpitiso.c b/src/codepage/cpitiso.c similarity index 100% rename from harbour/src/codepage/cpitiso.c rename to src/codepage/cpitiso.c diff --git a/harbour/src/codepage/cpitwin.c b/src/codepage/cpitwin.c similarity index 100% rename from harbour/src/codepage/cpitwin.c rename to src/codepage/cpitwin.c diff --git a/harbour/src/codepage/cplt775.c b/src/codepage/cplt775.c similarity index 100% rename from harbour/src/codepage/cplt775.c rename to src/codepage/cplt775.c diff --git a/harbour/src/codepage/cpltwin.c b/src/codepage/cpltwin.c similarity index 100% rename from harbour/src/codepage/cpltwin.c rename to src/codepage/cpltwin.c diff --git a/harbour/src/codepage/cpnl850.c b/src/codepage/cpnl850.c similarity index 100% rename from harbour/src/codepage/cpnl850.c rename to src/codepage/cpnl850.c diff --git a/harbour/src/codepage/cpnl850m.c b/src/codepage/cpnl850m.c similarity index 100% rename from harbour/src/codepage/cpnl850m.c rename to src/codepage/cpnl850m.c diff --git a/harbour/src/codepage/cpno865.c b/src/codepage/cpno865.c similarity index 100% rename from harbour/src/codepage/cpno865.c rename to src/codepage/cpno865.c diff --git a/harbour/src/codepage/cppl852.c b/src/codepage/cppl852.c similarity index 100% rename from harbour/src/codepage/cppl852.c rename to src/codepage/cppl852.c diff --git a/harbour/src/codepage/cppliso.c b/src/codepage/cppliso.c similarity index 100% rename from harbour/src/codepage/cppliso.c rename to src/codepage/cppliso.c diff --git a/harbour/src/codepage/cpplmaz.c b/src/codepage/cpplmaz.c similarity index 100% rename from harbour/src/codepage/cpplmaz.c rename to src/codepage/cpplmaz.c diff --git a/harbour/src/codepage/cpplwin.c b/src/codepage/cpplwin.c similarity index 100% rename from harbour/src/codepage/cpplwin.c rename to src/codepage/cpplwin.c diff --git a/harbour/src/codepage/cppt850.c b/src/codepage/cppt850.c similarity index 100% rename from harbour/src/codepage/cppt850.c rename to src/codepage/cppt850.c diff --git a/harbour/src/codepage/cppt860.c b/src/codepage/cppt860.c similarity index 100% rename from harbour/src/codepage/cppt860.c rename to src/codepage/cppt860.c diff --git a/harbour/src/codepage/cpptiso.c b/src/codepage/cpptiso.c similarity index 100% rename from harbour/src/codepage/cpptiso.c rename to src/codepage/cpptiso.c diff --git a/harbour/src/codepage/cpro852.c b/src/codepage/cpro852.c similarity index 100% rename from harbour/src/codepage/cpro852.c rename to src/codepage/cpro852.c diff --git a/harbour/src/codepage/cproiso.c b/src/codepage/cproiso.c similarity index 100% rename from harbour/src/codepage/cproiso.c rename to src/codepage/cproiso.c diff --git a/harbour/src/codepage/cprowin.c b/src/codepage/cprowin.c similarity index 100% rename from harbour/src/codepage/cprowin.c rename to src/codepage/cprowin.c diff --git a/harbour/src/codepage/cpru1251.c b/src/codepage/cpru1251.c similarity index 100% rename from harbour/src/codepage/cpru1251.c rename to src/codepage/cpru1251.c diff --git a/harbour/src/codepage/cpru866.c b/src/codepage/cpru866.c similarity index 100% rename from harbour/src/codepage/cpru866.c rename to src/codepage/cpru866.c diff --git a/harbour/src/codepage/cpruiso.c b/src/codepage/cpruiso.c similarity index 100% rename from harbour/src/codepage/cpruiso.c rename to src/codepage/cpruiso.c diff --git a/harbour/src/codepage/cprukoi8.c b/src/codepage/cprukoi8.c similarity index 100% rename from harbour/src/codepage/cprukoi8.c rename to src/codepage/cprukoi8.c diff --git a/harbour/src/codepage/cpsk852.c b/src/codepage/cpsk852.c similarity index 100% rename from harbour/src/codepage/cpsk852.c rename to src/codepage/cpsk852.c diff --git a/harbour/src/codepage/cpsk852c.c b/src/codepage/cpsk852c.c similarity index 100% rename from harbour/src/codepage/cpsk852c.c rename to src/codepage/cpsk852c.c diff --git a/harbour/src/codepage/cpskiso.c b/src/codepage/cpskiso.c similarity index 100% rename from harbour/src/codepage/cpskiso.c rename to src/codepage/cpskiso.c diff --git a/harbour/src/codepage/cpskkamc.c b/src/codepage/cpskkamc.c similarity index 100% rename from harbour/src/codepage/cpskkamc.c rename to src/codepage/cpskkamc.c diff --git a/harbour/src/codepage/cpskwin.c b/src/codepage/cpskwin.c similarity index 100% rename from harbour/src/codepage/cpskwin.c rename to src/codepage/cpskwin.c diff --git a/harbour/src/codepage/cpsl646.c b/src/codepage/cpsl646.c similarity index 100% rename from harbour/src/codepage/cpsl646.c rename to src/codepage/cpsl646.c diff --git a/harbour/src/codepage/cpsl852.c b/src/codepage/cpsl852.c similarity index 100% rename from harbour/src/codepage/cpsl852.c rename to src/codepage/cpsl852.c diff --git a/harbour/src/codepage/cpsliso.c b/src/codepage/cpsliso.c similarity index 100% rename from harbour/src/codepage/cpsliso.c rename to src/codepage/cpsliso.c diff --git a/harbour/src/codepage/cpslwin.c b/src/codepage/cpslwin.c similarity index 100% rename from harbour/src/codepage/cpslwin.c rename to src/codepage/cpslwin.c diff --git a/harbour/src/codepage/cpsr646.c b/src/codepage/cpsr646.c similarity index 100% rename from harbour/src/codepage/cpsr646.c rename to src/codepage/cpsr646.c diff --git a/harbour/src/codepage/cpsr646c.c b/src/codepage/cpsr646c.c similarity index 100% rename from harbour/src/codepage/cpsr646c.c rename to src/codepage/cpsr646c.c diff --git a/harbour/src/codepage/cpsrwin.c b/src/codepage/cpsrwin.c similarity index 100% rename from harbour/src/codepage/cpsrwin.c rename to src/codepage/cpsrwin.c diff --git a/harbour/src/codepage/cpsv437c.c b/src/codepage/cpsv437c.c similarity index 100% rename from harbour/src/codepage/cpsv437c.c rename to src/codepage/cpsv437c.c diff --git a/harbour/src/codepage/cpsv850.c b/src/codepage/cpsv850.c similarity index 100% rename from harbour/src/codepage/cpsv850.c rename to src/codepage/cpsv850.c diff --git a/harbour/src/codepage/cpsv850m.c b/src/codepage/cpsv850m.c similarity index 100% rename from harbour/src/codepage/cpsv850m.c rename to src/codepage/cpsv850m.c diff --git a/harbour/src/codepage/cpsviso.c b/src/codepage/cpsviso.c similarity index 100% rename from harbour/src/codepage/cpsviso.c rename to src/codepage/cpsviso.c diff --git a/harbour/src/codepage/cpsvwin.c b/src/codepage/cpsvwin.c similarity index 100% rename from harbour/src/codepage/cpsvwin.c rename to src/codepage/cpsvwin.c diff --git a/harbour/src/codepage/cptr857.c b/src/codepage/cptr857.c similarity index 100% rename from harbour/src/codepage/cptr857.c rename to src/codepage/cptr857.c diff --git a/harbour/src/codepage/cptriso.c b/src/codepage/cptriso.c similarity index 100% rename from harbour/src/codepage/cptriso.c rename to src/codepage/cptriso.c diff --git a/harbour/src/codepage/cptrwin.c b/src/codepage/cptrwin.c similarity index 100% rename from harbour/src/codepage/cptrwin.c rename to src/codepage/cptrwin.c diff --git a/harbour/src/codepage/cpua1125.c b/src/codepage/cpua1125.c similarity index 100% rename from harbour/src/codepage/cpua1125.c rename to src/codepage/cpua1125.c diff --git a/harbour/src/codepage/cpua1251.c b/src/codepage/cpua1251.c similarity index 100% rename from harbour/src/codepage/cpua1251.c rename to src/codepage/cpua1251.c diff --git a/harbour/src/codepage/cpua866.c b/src/codepage/cpua866.c similarity index 100% rename from harbour/src/codepage/cpua866.c rename to src/codepage/cpua866.c diff --git a/harbour/src/codepage/cpuakoi8.c b/src/codepage/cpuakoi8.c similarity index 100% rename from harbour/src/codepage/cpuakoi8.c rename to src/codepage/cpuakoi8.c diff --git a/harbour/src/codepage/gbk.c b/src/codepage/gbk.c similarity index 100% rename from harbour/src/codepage/gbk.c rename to src/codepage/gbk.c diff --git a/harbour/src/codepage/l_bg.h b/src/codepage/l_bg.h similarity index 100% rename from harbour/src/codepage/l_bg.h rename to src/codepage/l_bg.h diff --git a/harbour/src/codepage/l_cs.h b/src/codepage/l_cs.h similarity index 100% rename from harbour/src/codepage/l_cs.h rename to src/codepage/l_cs.h diff --git a/harbour/src/codepage/l_de.h b/src/codepage/l_de.h similarity index 100% rename from harbour/src/codepage/l_de.h rename to src/codepage/l_de.h diff --git a/harbour/src/codepage/l_el.h b/src/codepage/l_el.h similarity index 100% rename from harbour/src/codepage/l_el.h rename to src/codepage/l_el.h diff --git a/harbour/src/codepage/l_es.h b/src/codepage/l_es.h similarity index 100% rename from harbour/src/codepage/l_es.h rename to src/codepage/l_es.h diff --git a/harbour/src/codepage/l_fr.h b/src/codepage/l_fr.h similarity index 100% rename from harbour/src/codepage/l_fr.h rename to src/codepage/l_fr.h diff --git a/harbour/src/codepage/l_he.h b/src/codepage/l_he.h similarity index 100% rename from harbour/src/codepage/l_he.h rename to src/codepage/l_he.h diff --git a/harbour/src/codepage/l_hr.h b/src/codepage/l_hr.h similarity index 100% rename from harbour/src/codepage/l_hr.h rename to src/codepage/l_hr.h diff --git a/harbour/src/codepage/l_hu.h b/src/codepage/l_hu.h similarity index 100% rename from harbour/src/codepage/l_hu.h rename to src/codepage/l_hu.h diff --git a/harbour/src/codepage/l_is.h b/src/codepage/l_is.h similarity index 100% rename from harbour/src/codepage/l_is.h rename to src/codepage/l_is.h diff --git a/harbour/src/codepage/l_it.h b/src/codepage/l_it.h similarity index 100% rename from harbour/src/codepage/l_it.h rename to src/codepage/l_it.h diff --git a/harbour/src/codepage/l_lt.h b/src/codepage/l_lt.h similarity index 100% rename from harbour/src/codepage/l_lt.h rename to src/codepage/l_lt.h diff --git a/harbour/src/codepage/l_pl.h b/src/codepage/l_pl.h similarity index 100% rename from harbour/src/codepage/l_pl.h rename to src/codepage/l_pl.h diff --git a/harbour/src/codepage/l_pt.h b/src/codepage/l_pt.h similarity index 100% rename from harbour/src/codepage/l_pt.h rename to src/codepage/l_pt.h diff --git a/harbour/src/codepage/l_ro.h b/src/codepage/l_ro.h similarity index 100% rename from harbour/src/codepage/l_ro.h rename to src/codepage/l_ro.h diff --git a/harbour/src/codepage/l_ru.h b/src/codepage/l_ru.h similarity index 100% rename from harbour/src/codepage/l_ru.h rename to src/codepage/l_ru.h diff --git a/harbour/src/codepage/l_sk.h b/src/codepage/l_sk.h similarity index 100% rename from harbour/src/codepage/l_sk.h rename to src/codepage/l_sk.h diff --git a/harbour/src/codepage/l_sl.h b/src/codepage/l_sl.h similarity index 100% rename from harbour/src/codepage/l_sl.h rename to src/codepage/l_sl.h diff --git a/harbour/src/codepage/l_sr_cyr.h b/src/codepage/l_sr_cyr.h similarity index 100% rename from harbour/src/codepage/l_sr_cyr.h rename to src/codepage/l_sr_cyr.h diff --git a/harbour/src/codepage/l_sr_lat.h b/src/codepage/l_sr_lat.h similarity index 100% rename from harbour/src/codepage/l_sr_lat.h rename to src/codepage/l_sr_lat.h diff --git a/harbour/src/codepage/l_sv.h b/src/codepage/l_sv.h similarity index 100% rename from harbour/src/codepage/l_sv.h rename to src/codepage/l_sv.h diff --git a/harbour/src/codepage/l_tr.h b/src/codepage/l_tr.h similarity index 100% rename from harbour/src/codepage/l_tr.h rename to src/codepage/l_tr.h diff --git a/harbour/src/codepage/l_uk.h b/src/codepage/l_uk.h similarity index 100% rename from harbour/src/codepage/l_uk.h rename to src/codepage/l_uk.h diff --git a/harbour/src/codepage/uc037.c b/src/codepage/uc037.c similarity index 100% rename from harbour/src/codepage/uc037.c rename to src/codepage/uc037.c diff --git a/harbour/src/codepage/uc1006.c b/src/codepage/uc1006.c similarity index 100% rename from harbour/src/codepage/uc1006.c rename to src/codepage/uc1006.c diff --git a/harbour/src/codepage/uc1026.c b/src/codepage/uc1026.c similarity index 100% rename from harbour/src/codepage/uc1026.c rename to src/codepage/uc1026.c diff --git a/harbour/src/codepage/uc1125.c b/src/codepage/uc1125.c similarity index 100% rename from harbour/src/codepage/uc1125.c rename to src/codepage/uc1125.c diff --git a/harbour/src/codepage/uc1250.c b/src/codepage/uc1250.c similarity index 100% rename from harbour/src/codepage/uc1250.c rename to src/codepage/uc1250.c diff --git a/harbour/src/codepage/uc1251.c b/src/codepage/uc1251.c similarity index 100% rename from harbour/src/codepage/uc1251.c rename to src/codepage/uc1251.c diff --git a/harbour/src/codepage/uc1252.c b/src/codepage/uc1252.c similarity index 100% rename from harbour/src/codepage/uc1252.c rename to src/codepage/uc1252.c diff --git a/harbour/src/codepage/uc1253.c b/src/codepage/uc1253.c similarity index 100% rename from harbour/src/codepage/uc1253.c rename to src/codepage/uc1253.c diff --git a/harbour/src/codepage/uc1254.c b/src/codepage/uc1254.c similarity index 100% rename from harbour/src/codepage/uc1254.c rename to src/codepage/uc1254.c diff --git a/harbour/src/codepage/uc1255.c b/src/codepage/uc1255.c similarity index 100% rename from harbour/src/codepage/uc1255.c rename to src/codepage/uc1255.c diff --git a/harbour/src/codepage/uc1256.c b/src/codepage/uc1256.c similarity index 100% rename from harbour/src/codepage/uc1256.c rename to src/codepage/uc1256.c diff --git a/harbour/src/codepage/uc1257.c b/src/codepage/uc1257.c similarity index 100% rename from harbour/src/codepage/uc1257.c rename to src/codepage/uc1257.c diff --git a/harbour/src/codepage/uc1258.c b/src/codepage/uc1258.c similarity index 100% rename from harbour/src/codepage/uc1258.c rename to src/codepage/uc1258.c diff --git a/harbour/src/codepage/uc16def.c b/src/codepage/uc16def.c similarity index 100% rename from harbour/src/codepage/uc16def.c rename to src/codepage/uc16def.c diff --git a/harbour/src/codepage/uc424.c b/src/codepage/uc424.c similarity index 100% rename from harbour/src/codepage/uc424.c rename to src/codepage/uc424.c diff --git a/harbour/src/codepage/uc500.c b/src/codepage/uc500.c similarity index 100% rename from harbour/src/codepage/uc500.c rename to src/codepage/uc500.c diff --git a/harbour/src/codepage/uc646_yu.c b/src/codepage/uc646_yu.c similarity index 100% rename from harbour/src/codepage/uc646_yu.c rename to src/codepage/uc646_yu.c diff --git a/harbour/src/codepage/uc646yuc.c b/src/codepage/uc646yuc.c similarity index 100% rename from harbour/src/codepage/uc646yuc.c rename to src/codepage/uc646yuc.c diff --git a/harbour/src/codepage/uc737.c b/src/codepage/uc737.c similarity index 100% rename from harbour/src/codepage/uc737.c rename to src/codepage/uc737.c diff --git a/harbour/src/codepage/uc775.c b/src/codepage/uc775.c similarity index 100% rename from harbour/src/codepage/uc775.c rename to src/codepage/uc775.c diff --git a/harbour/src/codepage/uc850.c b/src/codepage/uc850.c similarity index 100% rename from harbour/src/codepage/uc850.c rename to src/codepage/uc850.c diff --git a/harbour/src/codepage/uc852.c b/src/codepage/uc852.c similarity index 100% rename from harbour/src/codepage/uc852.c rename to src/codepage/uc852.c diff --git a/harbour/src/codepage/uc855.c b/src/codepage/uc855.c similarity index 100% rename from harbour/src/codepage/uc855.c rename to src/codepage/uc855.c diff --git a/harbour/src/codepage/uc856.c b/src/codepage/uc856.c similarity index 100% rename from harbour/src/codepage/uc856.c rename to src/codepage/uc856.c diff --git a/harbour/src/codepage/uc857.c b/src/codepage/uc857.c similarity index 100% rename from harbour/src/codepage/uc857.c rename to src/codepage/uc857.c diff --git a/harbour/src/codepage/uc858.c b/src/codepage/uc858.c similarity index 100% rename from harbour/src/codepage/uc858.c rename to src/codepage/uc858.c diff --git a/harbour/src/codepage/uc860.c b/src/codepage/uc860.c similarity index 100% rename from harbour/src/codepage/uc860.c rename to src/codepage/uc860.c diff --git a/harbour/src/codepage/uc861.c b/src/codepage/uc861.c similarity index 100% rename from harbour/src/codepage/uc861.c rename to src/codepage/uc861.c diff --git a/harbour/src/codepage/uc862.c b/src/codepage/uc862.c similarity index 100% rename from harbour/src/codepage/uc862.c rename to src/codepage/uc862.c diff --git a/harbour/src/codepage/uc863.c b/src/codepage/uc863.c similarity index 100% rename from harbour/src/codepage/uc863.c rename to src/codepage/uc863.c diff --git a/harbour/src/codepage/uc864.c b/src/codepage/uc864.c similarity index 100% rename from harbour/src/codepage/uc864.c rename to src/codepage/uc864.c diff --git a/harbour/src/codepage/uc865.c b/src/codepage/uc865.c similarity index 100% rename from harbour/src/codepage/uc865.c rename to src/codepage/uc865.c diff --git a/harbour/src/codepage/uc866.c b/src/codepage/uc866.c similarity index 100% rename from harbour/src/codepage/uc866.c rename to src/codepage/uc866.c diff --git a/harbour/src/codepage/uc869.c b/src/codepage/uc869.c similarity index 100% rename from harbour/src/codepage/uc869.c rename to src/codepage/uc869.c diff --git a/harbour/src/codepage/uc874.c b/src/codepage/uc874.c similarity index 100% rename from harbour/src/codepage/uc874.c rename to src/codepage/uc874.c diff --git a/harbour/src/codepage/uc875.c b/src/codepage/uc875.c similarity index 100% rename from harbour/src/codepage/uc875.c rename to src/codepage/uc875.c diff --git a/harbour/src/codepage/uc885910.c b/src/codepage/uc885910.c similarity index 100% rename from harbour/src/codepage/uc885910.c rename to src/codepage/uc885910.c diff --git a/harbour/src/codepage/uc885911.c b/src/codepage/uc885911.c similarity index 100% rename from harbour/src/codepage/uc885911.c rename to src/codepage/uc885911.c diff --git a/harbour/src/codepage/uc885913.c b/src/codepage/uc885913.c similarity index 100% rename from harbour/src/codepage/uc885913.c rename to src/codepage/uc885913.c diff --git a/harbour/src/codepage/uc885914.c b/src/codepage/uc885914.c similarity index 100% rename from harbour/src/codepage/uc885914.c rename to src/codepage/uc885914.c diff --git a/harbour/src/codepage/uc885915.c b/src/codepage/uc885915.c similarity index 100% rename from harbour/src/codepage/uc885915.c rename to src/codepage/uc885915.c diff --git a/harbour/src/codepage/uc885916.c b/src/codepage/uc885916.c similarity index 100% rename from harbour/src/codepage/uc885916.c rename to src/codepage/uc885916.c diff --git a/harbour/src/codepage/uc88591b.c b/src/codepage/uc88591b.c similarity index 100% rename from harbour/src/codepage/uc88591b.c rename to src/codepage/uc88591b.c diff --git a/harbour/src/codepage/uc8859_1.c b/src/codepage/uc8859_1.c similarity index 100% rename from harbour/src/codepage/uc8859_1.c rename to src/codepage/uc8859_1.c diff --git a/harbour/src/codepage/uc8859_2.c b/src/codepage/uc8859_2.c similarity index 100% rename from harbour/src/codepage/uc8859_2.c rename to src/codepage/uc8859_2.c diff --git a/harbour/src/codepage/uc8859_3.c b/src/codepage/uc8859_3.c similarity index 100% rename from harbour/src/codepage/uc8859_3.c rename to src/codepage/uc8859_3.c diff --git a/harbour/src/codepage/uc8859_4.c b/src/codepage/uc8859_4.c similarity index 100% rename from harbour/src/codepage/uc8859_4.c rename to src/codepage/uc8859_4.c diff --git a/harbour/src/codepage/uc8859_5.c b/src/codepage/uc8859_5.c similarity index 100% rename from harbour/src/codepage/uc8859_5.c rename to src/codepage/uc8859_5.c diff --git a/harbour/src/codepage/uc8859_6.c b/src/codepage/uc8859_6.c similarity index 100% rename from harbour/src/codepage/uc8859_6.c rename to src/codepage/uc8859_6.c diff --git a/harbour/src/codepage/uc8859_7.c b/src/codepage/uc8859_7.c similarity index 100% rename from harbour/src/codepage/uc8859_7.c rename to src/codepage/uc8859_7.c diff --git a/harbour/src/codepage/uc8859_8.c b/src/codepage/uc8859_8.c similarity index 100% rename from harbour/src/codepage/uc8859_8.c rename to src/codepage/uc8859_8.c diff --git a/harbour/src/codepage/uc8859_9.c b/src/codepage/uc8859_9.c similarity index 100% rename from harbour/src/codepage/uc8859_9.c rename to src/codepage/uc8859_9.c diff --git a/harbour/src/codepage/ucascii.c b/src/codepage/ucascii.c similarity index 100% rename from harbour/src/codepage/ucascii.c rename to src/codepage/ucascii.c diff --git a/harbour/src/codepage/ucatari.c b/src/codepage/ucatari.c similarity index 100% rename from harbour/src/codepage/ucatari.c rename to src/codepage/ucatari.c diff --git a/harbour/src/codepage/uckam.c b/src/codepage/uckam.c similarity index 100% rename from harbour/src/codepage/uckam.c rename to src/codepage/uckam.c diff --git a/harbour/src/codepage/uckoi8.c b/src/codepage/uckoi8.c similarity index 100% rename from harbour/src/codepage/uckoi8.c rename to src/codepage/uckoi8.c diff --git a/harbour/src/codepage/uckoi8u.c b/src/codepage/uckoi8u.c similarity index 100% rename from harbour/src/codepage/uckoi8u.c rename to src/codepage/uckoi8u.c diff --git a/harbour/src/codepage/ucmacce.c b/src/codepage/ucmacce.c similarity index 100% rename from harbour/src/codepage/ucmacce.c rename to src/codepage/ucmacce.c diff --git a/harbour/src/codepage/ucmaccyr.c b/src/codepage/ucmaccyr.c similarity index 100% rename from harbour/src/codepage/ucmaccyr.c rename to src/codepage/ucmaccyr.c diff --git a/harbour/src/codepage/ucmacgrk.c b/src/codepage/ucmacgrk.c similarity index 100% rename from harbour/src/codepage/ucmacgrk.c rename to src/codepage/ucmacgrk.c diff --git a/harbour/src/codepage/ucmacice.c b/src/codepage/ucmacice.c similarity index 100% rename from harbour/src/codepage/ucmacice.c rename to src/codepage/ucmacice.c diff --git a/harbour/src/codepage/ucmacrom.c b/src/codepage/ucmacrom.c similarity index 100% rename from harbour/src/codepage/ucmacrom.c rename to src/codepage/ucmacrom.c diff --git a/harbour/src/codepage/ucmactrk.c b/src/codepage/ucmactrk.c similarity index 100% rename from harbour/src/codepage/ucmactrk.c rename to src/codepage/ucmactrk.c diff --git a/harbour/src/codepage/ucmaz.c b/src/codepage/ucmaz.c similarity index 100% rename from harbour/src/codepage/ucmaz.c rename to src/codepage/ucmaz.c diff --git a/harbour/src/codepage/ucmik.c b/src/codepage/ucmik.c similarity index 100% rename from harbour/src/codepage/ucmik.c rename to src/codepage/ucmik.c diff --git a/harbour/src/codepage/ucnext.c b/src/codepage/ucnext.c similarity index 100% rename from harbour/src/codepage/ucnext.c rename to src/codepage/ucnext.c diff --git a/harbour/src/codepage/utf8sort.c b/src/codepage/utf8sort.c similarity index 100% rename from harbour/src/codepage/utf8sort.c rename to src/codepage/utf8sort.c diff --git a/harbour/src/common/Makefile b/src/common/Makefile similarity index 100% rename from harbour/src/common/Makefile rename to src/common/Makefile diff --git a/harbour/src/common/expropt1.c b/src/common/expropt1.c similarity index 100% rename from harbour/src/common/expropt1.c rename to src/common/expropt1.c diff --git a/harbour/src/common/expropt2.c b/src/common/expropt2.c similarity index 100% rename from harbour/src/common/expropt2.c rename to src/common/expropt2.c diff --git a/harbour/src/common/funcid.c b/src/common/funcid.c similarity index 100% rename from harbour/src/common/funcid.c rename to src/common/funcid.c diff --git a/harbour/src/common/hbarch.c b/src/common/hbarch.c similarity index 100% rename from harbour/src/common/hbarch.c rename to src/common/hbarch.c diff --git a/harbour/src/common/hbdate.c b/src/common/hbdate.c similarity index 100% rename from harbour/src/common/hbdate.c rename to src/common/hbdate.c diff --git a/harbour/src/common/hbffind.c b/src/common/hbffind.c similarity index 100% rename from harbour/src/common/hbffind.c rename to src/common/hbffind.c diff --git a/harbour/src/common/hbfopen.c b/src/common/hbfopen.c similarity index 100% rename from harbour/src/common/hbfopen.c rename to src/common/hbfopen.c diff --git a/harbour/src/common/hbfsapi.c b/src/common/hbfsapi.c similarity index 100% rename from harbour/src/common/hbfsapi.c rename to src/common/hbfsapi.c diff --git a/harbour/src/common/hbgete.c b/src/common/hbgete.c similarity index 100% rename from harbour/src/common/hbgete.c rename to src/common/hbgete.c diff --git a/harbour/src/common/hbhash.c b/src/common/hbhash.c similarity index 100% rename from harbour/src/common/hbhash.c rename to src/common/hbhash.c diff --git a/harbour/src/common/hbmem.c b/src/common/hbmem.c similarity index 100% rename from harbour/src/common/hbmem.c rename to src/common/hbmem.c diff --git a/harbour/src/common/hbprintf.c b/src/common/hbprintf.c similarity index 100% rename from harbour/src/common/hbprintf.c rename to src/common/hbprintf.c diff --git a/harbour/src/common/hbstr.c b/src/common/hbstr.c similarity index 100% rename from harbour/src/common/hbstr.c rename to src/common/hbstr.c diff --git a/harbour/src/common/hbstrbm.c b/src/common/hbstrbm.c similarity index 100% rename from harbour/src/common/hbstrbm.c rename to src/common/hbstrbm.c diff --git a/harbour/src/common/hbtrace.c b/src/common/hbtrace.c similarity index 100% rename from harbour/src/common/hbtrace.c rename to src/common/hbtrace.c diff --git a/harbour/src/common/hbver.c b/src/common/hbver.c similarity index 100% rename from harbour/src/common/hbver.c rename to src/common/hbver.c diff --git a/harbour/src/common/hbverdsp.c b/src/common/hbverdsp.c similarity index 100% rename from harbour/src/common/hbverdsp.c rename to src/common/hbverdsp.c diff --git a/harbour/src/common/hbwin.c b/src/common/hbwin.c similarity index 100% rename from harbour/src/common/hbwin.c rename to src/common/hbwin.c diff --git a/harbour/src/common/hbwince.c b/src/common/hbwince.c similarity index 100% rename from harbour/src/common/hbwince.c rename to src/common/hbwince.c diff --git a/harbour/src/common/strwild.c b/src/common/strwild.c similarity index 100% rename from harbour/src/common/strwild.c rename to src/common/strwild.c diff --git a/harbour/src/compiler/Makefile b/src/compiler/Makefile similarity index 100% rename from harbour/src/compiler/Makefile rename to src/compiler/Makefile diff --git a/harbour/src/compiler/cmdcheck.c b/src/compiler/cmdcheck.c similarity index 100% rename from harbour/src/compiler/cmdcheck.c rename to src/compiler/cmdcheck.c diff --git a/harbour/src/compiler/compi18n.c b/src/compiler/compi18n.c similarity index 100% rename from harbour/src/compiler/compi18n.c rename to src/compiler/compi18n.c diff --git a/harbour/src/compiler/complex.c b/src/compiler/complex.c similarity index 100% rename from harbour/src/compiler/complex.c rename to src/compiler/complex.c diff --git a/harbour/src/compiler/expropta.c b/src/compiler/expropta.c similarity index 100% rename from harbour/src/compiler/expropta.c rename to src/compiler/expropta.c diff --git a/harbour/src/compiler/exproptb.c b/src/compiler/exproptb.c similarity index 100% rename from harbour/src/compiler/exproptb.c rename to src/compiler/exproptb.c diff --git a/harbour/src/compiler/genc.c b/src/compiler/genc.c similarity index 100% rename from harbour/src/compiler/genc.c rename to src/compiler/genc.c diff --git a/harbour/src/compiler/gencc.c b/src/compiler/gencc.c similarity index 100% rename from harbour/src/compiler/gencc.c rename to src/compiler/gencc.c diff --git a/harbour/src/compiler/genhrb.c b/src/compiler/genhrb.c similarity index 100% rename from harbour/src/compiler/genhrb.c rename to src/compiler/genhrb.c diff --git a/harbour/src/compiler/harbour.y b/src/compiler/harbour.y similarity index 100% rename from harbour/src/compiler/harbour.y rename to src/compiler/harbour.y diff --git a/harbour/src/compiler/harbour.yyc b/src/compiler/harbour.yyc similarity index 100% rename from harbour/src/compiler/harbour.yyc rename to src/compiler/harbour.yyc diff --git a/harbour/src/compiler/harbour.yyh b/src/compiler/harbour.yyh similarity index 100% rename from harbour/src/compiler/harbour.yyh rename to src/compiler/harbour.yyh diff --git a/harbour/src/compiler/hbcmplib.c b/src/compiler/hbcmplib.c similarity index 100% rename from harbour/src/compiler/hbcmplib.c rename to src/compiler/hbcmplib.c diff --git a/harbour/src/compiler/hbcomp.c b/src/compiler/hbcomp.c similarity index 100% rename from harbour/src/compiler/hbcomp.c rename to src/compiler/hbcomp.c diff --git a/harbour/src/compiler/hbdbginf.c b/src/compiler/hbdbginf.c similarity index 100% rename from harbour/src/compiler/hbdbginf.c rename to src/compiler/hbdbginf.c diff --git a/harbour/src/compiler/hbdead.c b/src/compiler/hbdead.c similarity index 100% rename from harbour/src/compiler/hbdead.c rename to src/compiler/hbdead.c diff --git a/harbour/src/compiler/hbfix.c b/src/compiler/hbfix.c similarity index 100% rename from harbour/src/compiler/hbfix.c rename to src/compiler/hbfix.c diff --git a/harbour/src/compiler/hbfunchk.c b/src/compiler/hbfunchk.c similarity index 100% rename from harbour/src/compiler/hbfunchk.c rename to src/compiler/hbfunchk.c diff --git a/harbour/src/compiler/hbgenerr.c b/src/compiler/hbgenerr.c similarity index 100% rename from harbour/src/compiler/hbgenerr.c rename to src/compiler/hbgenerr.c diff --git a/harbour/src/compiler/hbident.c b/src/compiler/hbident.c similarity index 100% rename from harbour/src/compiler/hbident.c rename to src/compiler/hbident.c diff --git a/harbour/src/compiler/hblbl.c b/src/compiler/hblbl.c similarity index 100% rename from harbour/src/compiler/hblbl.c rename to src/compiler/hblbl.c diff --git a/harbour/src/compiler/hbmain.c b/src/compiler/hbmain.c similarity index 100% rename from harbour/src/compiler/hbmain.c rename to src/compiler/hbmain.c diff --git a/harbour/src/compiler/hbopt.c b/src/compiler/hbopt.c similarity index 100% rename from harbour/src/compiler/hbopt.c rename to src/compiler/hbopt.c diff --git a/harbour/src/compiler/hbpcode.c b/src/compiler/hbpcode.c similarity index 100% rename from harbour/src/compiler/hbpcode.c rename to src/compiler/hbpcode.c diff --git a/harbour/src/compiler/hbstripl.c b/src/compiler/hbstripl.c similarity index 100% rename from harbour/src/compiler/hbstripl.c rename to src/compiler/hbstripl.c diff --git a/harbour/src/compiler/hbusage.c b/src/compiler/hbusage.c similarity index 100% rename from harbour/src/compiler/hbusage.c rename to src/compiler/hbusage.c diff --git a/harbour/src/compiler/ppcomp.c b/src/compiler/ppcomp.c similarity index 100% rename from harbour/src/compiler/ppcomp.c rename to src/compiler/ppcomp.c diff --git a/harbour/src/debug/Makefile b/src/debug/Makefile similarity index 100% rename from harbour/src/debug/Makefile rename to src/debug/Makefile diff --git a/harbour/src/debug/dbgbrwsr.prg b/src/debug/dbgbrwsr.prg similarity index 100% rename from harbour/src/debug/dbgbrwsr.prg rename to src/debug/dbgbrwsr.prg diff --git a/harbour/src/debug/dbgentry.c b/src/debug/dbgentry.c similarity index 100% rename from harbour/src/debug/dbgentry.c rename to src/debug/dbgentry.c diff --git a/harbour/src/debug/dbghelp.prg b/src/debug/dbghelp.prg similarity index 100% rename from harbour/src/debug/dbghelp.prg rename to src/debug/dbghelp.prg diff --git a/harbour/src/debug/dbgmenu.prg b/src/debug/dbgmenu.prg similarity index 100% rename from harbour/src/debug/dbgmenu.prg rename to src/debug/dbgmenu.prg diff --git a/harbour/src/debug/dbgtarr.prg b/src/debug/dbgtarr.prg similarity index 100% rename from harbour/src/debug/dbgtarr.prg rename to src/debug/dbgtarr.prg diff --git a/harbour/src/debug/dbgthsh.prg b/src/debug/dbgthsh.prg similarity index 100% rename from harbour/src/debug/dbgthsh.prg rename to src/debug/dbgthsh.prg diff --git a/harbour/src/debug/dbgtinp.prg b/src/debug/dbgtinp.prg similarity index 100% rename from harbour/src/debug/dbgtinp.prg rename to src/debug/dbgtinp.prg diff --git a/harbour/src/debug/dbgtmenu.prg b/src/debug/dbgtmenu.prg similarity index 100% rename from harbour/src/debug/dbgtmenu.prg rename to src/debug/dbgtmenu.prg diff --git a/harbour/src/debug/dbgtmitm.prg b/src/debug/dbgtmitm.prg similarity index 100% rename from harbour/src/debug/dbgtmitm.prg rename to src/debug/dbgtmitm.prg diff --git a/harbour/src/debug/dbgtobj.prg b/src/debug/dbgtobj.prg similarity index 100% rename from harbour/src/debug/dbgtobj.prg rename to src/debug/dbgtobj.prg diff --git a/harbour/src/debug/dbgtwin.prg b/src/debug/dbgtwin.prg similarity index 100% rename from harbour/src/debug/dbgtwin.prg rename to src/debug/dbgtwin.prg diff --git a/harbour/src/debug/dbgwa.prg b/src/debug/dbgwa.prg similarity index 100% rename from harbour/src/debug/dbgwa.prg rename to src/debug/dbgwa.prg diff --git a/harbour/src/debug/debugger.prg b/src/debug/debugger.prg similarity index 100% rename from harbour/src/debug/debugger.prg rename to src/debug/debugger.prg diff --git a/harbour/src/debug/tbrwtext.prg b/src/debug/tbrwtext.prg similarity index 100% rename from harbour/src/debug/tbrwtext.prg rename to src/debug/tbrwtext.prg diff --git a/harbour/src/dynlib/2nd/Makefile b/src/dynlib/2nd/Makefile similarity index 100% rename from harbour/src/dynlib/2nd/Makefile rename to src/dynlib/2nd/Makefile diff --git a/harbour/src/dynlib/Makefile b/src/dynlib/Makefile similarity index 100% rename from harbour/src/dynlib/Makefile rename to src/dynlib/Makefile diff --git a/harbour/src/hbextern/Makefile b/src/hbextern/Makefile similarity index 100% rename from harbour/src/hbextern/Makefile rename to src/hbextern/Makefile diff --git a/harbour/src/hbextern/hbextern.prg b/src/hbextern/hbextern.prg similarity index 100% rename from harbour/src/hbextern/hbextern.prg rename to src/hbextern/hbextern.prg diff --git a/harbour/src/lang/Makefile b/src/lang/Makefile similarity index 100% rename from harbour/src/lang/Makefile rename to src/lang/Makefile diff --git a/harbour/src/lang/l_be.c b/src/lang/l_be.c similarity index 100% rename from harbour/src/lang/l_be.c rename to src/lang/l_be.c diff --git a/harbour/src/lang/l_bg.c b/src/lang/l_bg.c similarity index 100% rename from harbour/src/lang/l_bg.c rename to src/lang/l_bg.c diff --git a/harbour/src/lang/l_ca.c b/src/lang/l_ca.c similarity index 100% rename from harbour/src/lang/l_ca.c rename to src/lang/l_ca.c diff --git a/harbour/src/lang/l_cs.c b/src/lang/l_cs.c similarity index 100% rename from harbour/src/lang/l_cs.c rename to src/lang/l_cs.c diff --git a/harbour/src/lang/l_de.c b/src/lang/l_de.c similarity index 100% rename from harbour/src/lang/l_de.c rename to src/lang/l_de.c diff --git a/harbour/src/lang/l_el.c b/src/lang/l_el.c similarity index 100% rename from harbour/src/lang/l_el.c rename to src/lang/l_el.c diff --git a/harbour/src/lang/l_en_tpl.c b/src/lang/l_en_tpl.c similarity index 100% rename from harbour/src/lang/l_en_tpl.c rename to src/lang/l_en_tpl.c diff --git a/harbour/src/lang/l_eo.c b/src/lang/l_eo.c similarity index 100% rename from harbour/src/lang/l_eo.c rename to src/lang/l_eo.c diff --git a/harbour/src/lang/l_es.c b/src/lang/l_es.c similarity index 100% rename from harbour/src/lang/l_es.c rename to src/lang/l_es.c diff --git a/harbour/src/lang/l_eu.c b/src/lang/l_eu.c similarity index 100% rename from harbour/src/lang/l_eu.c rename to src/lang/l_eu.c diff --git a/harbour/src/lang/l_fr.c b/src/lang/l_fr.c similarity index 100% rename from harbour/src/lang/l_fr.c rename to src/lang/l_fr.c diff --git a/harbour/src/lang/l_gl.c b/src/lang/l_gl.c similarity index 100% rename from harbour/src/lang/l_gl.c rename to src/lang/l_gl.c diff --git a/harbour/src/lang/l_he.c b/src/lang/l_he.c similarity index 100% rename from harbour/src/lang/l_he.c rename to src/lang/l_he.c diff --git a/harbour/src/lang/l_hr.c b/src/lang/l_hr.c similarity index 100% rename from harbour/src/lang/l_hr.c rename to src/lang/l_hr.c diff --git a/harbour/src/lang/l_hu.c b/src/lang/l_hu.c similarity index 100% rename from harbour/src/lang/l_hu.c rename to src/lang/l_hu.c diff --git a/harbour/src/lang/l_id.c b/src/lang/l_id.c similarity index 100% rename from harbour/src/lang/l_id.c rename to src/lang/l_id.c diff --git a/harbour/src/lang/l_is.c b/src/lang/l_is.c similarity index 100% rename from harbour/src/lang/l_is.c rename to src/lang/l_is.c diff --git a/harbour/src/lang/l_it.c b/src/lang/l_it.c similarity index 100% rename from harbour/src/lang/l_it.c rename to src/lang/l_it.c diff --git a/harbour/src/lang/l_ko.c b/src/lang/l_ko.c similarity index 100% rename from harbour/src/lang/l_ko.c rename to src/lang/l_ko.c diff --git a/harbour/src/lang/l_lt.c b/src/lang/l_lt.c similarity index 100% rename from harbour/src/lang/l_lt.c rename to src/lang/l_lt.c diff --git a/harbour/src/lang/l_nl.c b/src/lang/l_nl.c similarity index 100% rename from harbour/src/lang/l_nl.c rename to src/lang/l_nl.c diff --git a/harbour/src/lang/l_pl.c b/src/lang/l_pl.c similarity index 100% rename from harbour/src/lang/l_pl.c rename to src/lang/l_pl.c diff --git a/harbour/src/lang/l_pt.c b/src/lang/l_pt.c similarity index 100% rename from harbour/src/lang/l_pt.c rename to src/lang/l_pt.c diff --git a/harbour/src/lang/l_ro.c b/src/lang/l_ro.c similarity index 100% rename from harbour/src/lang/l_ro.c rename to src/lang/l_ro.c diff --git a/harbour/src/lang/l_ru.c b/src/lang/l_ru.c similarity index 100% rename from harbour/src/lang/l_ru.c rename to src/lang/l_ru.c diff --git a/harbour/src/lang/l_sk.c b/src/lang/l_sk.c similarity index 100% rename from harbour/src/lang/l_sk.c rename to src/lang/l_sk.c diff --git a/harbour/src/lang/l_sl.c b/src/lang/l_sl.c similarity index 100% rename from harbour/src/lang/l_sl.c rename to src/lang/l_sl.c diff --git a/harbour/src/lang/l_sr_cyr.c b/src/lang/l_sr_cyr.c similarity index 100% rename from harbour/src/lang/l_sr_cyr.c rename to src/lang/l_sr_cyr.c diff --git a/harbour/src/lang/l_sr_lat.c b/src/lang/l_sr_lat.c similarity index 100% rename from harbour/src/lang/l_sr_lat.c rename to src/lang/l_sr_lat.c diff --git a/harbour/src/lang/l_sv.c b/src/lang/l_sv.c similarity index 100% rename from harbour/src/lang/l_sv.c rename to src/lang/l_sv.c diff --git a/harbour/src/lang/l_tr.c b/src/lang/l_tr.c similarity index 100% rename from harbour/src/lang/l_tr.c rename to src/lang/l_tr.c diff --git a/harbour/src/lang/l_uk.c b/src/lang/l_uk.c similarity index 100% rename from harbour/src/lang/l_uk.c rename to src/lang/l_uk.c diff --git a/harbour/src/lang/l_zh_sim.c b/src/lang/l_zh_sim.c similarity index 100% rename from harbour/src/lang/l_zh_sim.c rename to src/lang/l_zh_sim.c diff --git a/harbour/src/lang/l_zh_tra.c b/src/lang/l_zh_tra.c similarity index 100% rename from harbour/src/lang/l_zh_tra.c rename to src/lang/l_zh_tra.c diff --git a/harbour/src/macro/Makefile b/src/macro/Makefile similarity index 100% rename from harbour/src/macro/Makefile rename to src/macro/Makefile diff --git a/harbour/src/macro/macro.y b/src/macro/macro.y similarity index 100% rename from harbour/src/macro/macro.y rename to src/macro/macro.y diff --git a/harbour/src/macro/macro.yyc b/src/macro/macro.yyc similarity index 100% rename from harbour/src/macro/macro.yyc rename to src/macro/macro.yyc diff --git a/harbour/src/macro/macro.yyh b/src/macro/macro.yyh similarity index 100% rename from harbour/src/macro/macro.yyh rename to src/macro/macro.yyh diff --git a/harbour/src/macro/macroa.c b/src/macro/macroa.c similarity index 100% rename from harbour/src/macro/macroa.c rename to src/macro/macroa.c diff --git a/harbour/src/macro/macrob.c b/src/macro/macrob.c similarity index 100% rename from harbour/src/macro/macrob.c rename to src/macro/macrob.c diff --git a/harbour/src/macro/macrolex.c b/src/macro/macrolex.c similarity index 100% rename from harbour/src/macro/macrolex.c rename to src/macro/macrolex.c diff --git a/harbour/src/main/Makefile b/src/main/Makefile similarity index 100% rename from harbour/src/main/Makefile rename to src/main/Makefile diff --git a/harbour/src/main/harbour.1 b/src/main/harbour.1 similarity index 100% rename from harbour/src/main/harbour.1 rename to src/main/harbour.1 diff --git a/harbour/src/main/harbour.c b/src/main/harbour.c similarity index 100% rename from harbour/src/main/harbour.c rename to src/main/harbour.c diff --git a/harbour/src/nortl/Makefile b/src/nortl/Makefile similarity index 100% rename from harbour/src/nortl/Makefile rename to src/nortl/Makefile diff --git a/harbour/src/nortl/nortl.c b/src/nortl/nortl.c similarity index 100% rename from harbour/src/nortl/nortl.c rename to src/nortl/nortl.c diff --git a/harbour/src/pp/Makefile b/src/pp/Makefile similarity index 100% rename from harbour/src/pp/Makefile rename to src/pp/Makefile diff --git a/harbour/src/pp/hbpp.1 b/src/pp/hbpp.1 similarity index 100% rename from harbour/src/pp/hbpp.1 rename to src/pp/hbpp.1 diff --git a/harbour/src/pp/hbpp.c b/src/pp/hbpp.c similarity index 100% rename from harbour/src/pp/hbpp.c rename to src/pp/hbpp.c diff --git a/harbour/src/pp/ppcore.c b/src/pp/ppcore.c similarity index 100% rename from harbour/src/pp/ppcore.c rename to src/pp/ppcore.c diff --git a/harbour/src/pp/pplib.c b/src/pp/pplib.c similarity index 100% rename from harbour/src/pp/pplib.c rename to src/pp/pplib.c diff --git a/harbour/src/pp/pplib2.c b/src/pp/pplib2.c similarity index 100% rename from harbour/src/pp/pplib2.c rename to src/pp/pplib2.c diff --git a/harbour/src/rdd/Makefile b/src/rdd/Makefile similarity index 100% rename from harbour/src/rdd/Makefile rename to src/rdd/Makefile diff --git a/harbour/src/rdd/dbcmd.c b/src/rdd/dbcmd.c similarity index 100% rename from harbour/src/rdd/dbcmd.c rename to src/rdd/dbcmd.c diff --git a/harbour/src/rdd/dbcmd53.c b/src/rdd/dbcmd53.c similarity index 100% rename from harbour/src/rdd/dbcmd53.c rename to src/rdd/dbcmd53.c diff --git a/harbour/src/rdd/dbcmdhb.c b/src/rdd/dbcmdhb.c similarity index 100% rename from harbour/src/rdd/dbcmdhb.c rename to src/rdd/dbcmdhb.c diff --git a/harbour/src/rdd/dbdelim.prg b/src/rdd/dbdelim.prg similarity index 100% rename from harbour/src/rdd/dbdelim.prg rename to src/rdd/dbdelim.prg diff --git a/harbour/src/rdd/dbdetach.c b/src/rdd/dbdetach.c similarity index 100% rename from harbour/src/rdd/dbdetach.c rename to src/rdd/dbdetach.c diff --git a/harbour/src/rdd/dbdrop.c b/src/rdd/dbdrop.c similarity index 100% rename from harbour/src/rdd/dbdrop.c rename to src/rdd/dbdrop.c diff --git a/harbour/src/rdd/dbexists.c b/src/rdd/dbexists.c similarity index 100% rename from harbour/src/rdd/dbexists.c rename to src/rdd/dbexists.c diff --git a/harbour/src/rdd/dbf1.c b/src/rdd/dbf1.c similarity index 100% rename from harbour/src/rdd/dbf1.c rename to src/rdd/dbf1.c diff --git a/harbour/src/rdd/dbfcdx/Makefile b/src/rdd/dbfcdx/Makefile similarity index 100% rename from harbour/src/rdd/dbfcdx/Makefile rename to src/rdd/dbfcdx/Makefile diff --git a/harbour/src/rdd/dbfcdx/dbfcdx1.c b/src/rdd/dbfcdx/dbfcdx1.c similarity index 100% rename from harbour/src/rdd/dbfcdx/dbfcdx1.c rename to src/rdd/dbfcdx/dbfcdx1.c diff --git a/harbour/src/rdd/dbfcdx/sixcdx1.c b/src/rdd/dbfcdx/sixcdx1.c similarity index 100% rename from harbour/src/rdd/dbfcdx/sixcdx1.c rename to src/rdd/dbfcdx/sixcdx1.c diff --git a/harbour/src/rdd/dbffpt/Makefile b/src/rdd/dbffpt/Makefile similarity index 100% rename from harbour/src/rdd/dbffpt/Makefile rename to src/rdd/dbffpt/Makefile diff --git a/harbour/src/rdd/dbffpt/dbffpt1.c b/src/rdd/dbffpt/dbffpt1.c similarity index 100% rename from harbour/src/rdd/dbffpt/dbffpt1.c rename to src/rdd/dbffpt/dbffpt1.c diff --git a/harbour/src/rdd/dbfnsx/Makefile b/src/rdd/dbfnsx/Makefile similarity index 100% rename from harbour/src/rdd/dbfnsx/Makefile rename to src/rdd/dbfnsx/Makefile diff --git a/harbour/src/rdd/dbfnsx/dbfnsx1.c b/src/rdd/dbfnsx/dbfnsx1.c similarity index 100% rename from harbour/src/rdd/dbfnsx/dbfnsx1.c rename to src/rdd/dbfnsx/dbfnsx1.c diff --git a/harbour/src/rdd/dbfntx/Makefile b/src/rdd/dbfntx/Makefile similarity index 100% rename from harbour/src/rdd/dbfntx/Makefile rename to src/rdd/dbfntx/Makefile diff --git a/harbour/src/rdd/dbfntx/dbfntx1.c b/src/rdd/dbfntx/dbfntx1.c similarity index 100% rename from harbour/src/rdd/dbfntx/dbfntx1.c rename to src/rdd/dbfntx/dbfntx1.c diff --git a/harbour/src/rdd/dbfuncs.prg b/src/rdd/dbfuncs.prg similarity index 100% rename from harbour/src/rdd/dbfuncs.prg rename to src/rdd/dbfuncs.prg diff --git a/harbour/src/rdd/dbjoin.prg b/src/rdd/dbjoin.prg similarity index 100% rename from harbour/src/rdd/dbjoin.prg rename to src/rdd/dbjoin.prg diff --git a/harbour/src/rdd/dblist.prg b/src/rdd/dblist.prg similarity index 100% rename from harbour/src/rdd/dblist.prg rename to src/rdd/dblist.prg diff --git a/harbour/src/rdd/dbnubs.c b/src/rdd/dbnubs.c similarity index 100% rename from harbour/src/rdd/dbnubs.c rename to src/rdd/dbnubs.c diff --git a/harbour/src/rdd/dbrename.c b/src/rdd/dbrename.c similarity index 100% rename from harbour/src/rdd/dbrename.c rename to src/rdd/dbrename.c diff --git a/harbour/src/rdd/dbsdf.prg b/src/rdd/dbsdf.prg similarity index 100% rename from harbour/src/rdd/dbsdf.prg rename to src/rdd/dbsdf.prg diff --git a/harbour/src/rdd/dbsort.prg b/src/rdd/dbsort.prg similarity index 100% rename from harbour/src/rdd/dbsort.prg rename to src/rdd/dbsort.prg diff --git a/harbour/src/rdd/dbsql.c b/src/rdd/dbsql.c similarity index 100% rename from harbour/src/rdd/dbsql.c rename to src/rdd/dbsql.c diff --git a/harbour/src/rdd/dbstrux.prg b/src/rdd/dbstrux.prg similarity index 100% rename from harbour/src/rdd/dbstrux.prg rename to src/rdd/dbstrux.prg diff --git a/harbour/src/rdd/dbstruxu.prg b/src/rdd/dbstruxu.prg similarity index 100% rename from harbour/src/rdd/dbstruxu.prg rename to src/rdd/dbstruxu.prg diff --git a/harbour/src/rdd/dbtotal.prg b/src/rdd/dbtotal.prg similarity index 100% rename from harbour/src/rdd/dbtotal.prg rename to src/rdd/dbtotal.prg diff --git a/harbour/src/rdd/dbupdat.prg b/src/rdd/dbupdat.prg similarity index 100% rename from harbour/src/rdd/dbupdat.prg rename to src/rdd/dbupdat.prg diff --git a/harbour/src/rdd/delim1.c b/src/rdd/delim1.c similarity index 100% rename from harbour/src/rdd/delim1.c rename to src/rdd/delim1.c diff --git a/harbour/src/rdd/fieldhb.c b/src/rdd/fieldhb.c similarity index 100% rename from harbour/src/rdd/fieldhb.c rename to src/rdd/fieldhb.c diff --git a/harbour/src/rdd/hbdbsort.c b/src/rdd/hbdbsort.c similarity index 100% rename from harbour/src/rdd/hbdbsort.c rename to src/rdd/hbdbsort.c diff --git a/harbour/src/rdd/hbsix/Makefile b/src/rdd/hbsix/Makefile similarity index 100% rename from harbour/src/rdd/hbsix/Makefile rename to src/rdd/hbsix/Makefile diff --git a/harbour/src/rdd/hbsix/sxcompat.prg b/src/rdd/hbsix/sxcompat.prg similarity index 100% rename from harbour/src/rdd/hbsix/sxcompat.prg rename to src/rdd/hbsix/sxcompat.prg diff --git a/harbour/src/rdd/hbsix/sxcompr.c b/src/rdd/hbsix/sxcompr.c similarity index 100% rename from harbour/src/rdd/hbsix/sxcompr.c rename to src/rdd/hbsix/sxcompr.c diff --git a/harbour/src/rdd/hbsix/sxcrypt.c b/src/rdd/hbsix/sxcrypt.c similarity index 100% rename from harbour/src/rdd/hbsix/sxcrypt.c rename to src/rdd/hbsix/sxcrypt.c diff --git a/harbour/src/rdd/hbsix/sxdate.c b/src/rdd/hbsix/sxdate.c similarity index 100% rename from harbour/src/rdd/hbsix/sxdate.c rename to src/rdd/hbsix/sxdate.c diff --git a/harbour/src/rdd/hbsix/sxfname.c b/src/rdd/hbsix/sxfname.c similarity index 100% rename from harbour/src/rdd/hbsix/sxfname.c rename to src/rdd/hbsix/sxfname.c diff --git a/harbour/src/rdd/hbsix/sxini.prg b/src/rdd/hbsix/sxini.prg similarity index 100% rename from harbour/src/rdd/hbsix/sxini.prg rename to src/rdd/hbsix/sxini.prg diff --git a/harbour/src/rdd/hbsix/sxord.c b/src/rdd/hbsix/sxord.c similarity index 100% rename from harbour/src/rdd/hbsix/sxord.c rename to src/rdd/hbsix/sxord.c diff --git a/harbour/src/rdd/hbsix/sxredir.c b/src/rdd/hbsix/sxredir.c similarity index 100% rename from harbour/src/rdd/hbsix/sxredir.c rename to src/rdd/hbsix/sxredir.c diff --git a/harbour/src/rdd/hbsix/sxsem.c b/src/rdd/hbsix/sxsem.c similarity index 100% rename from harbour/src/rdd/hbsix/sxsem.c rename to src/rdd/hbsix/sxsem.c diff --git a/harbour/src/rdd/hbsix/sxtable.c b/src/rdd/hbsix/sxtable.c similarity index 100% rename from harbour/src/rdd/hbsix/sxtable.c rename to src/rdd/hbsix/sxtable.c diff --git a/harbour/src/rdd/hbsix/sxtrig.prg b/src/rdd/hbsix/sxtrig.prg similarity index 100% rename from harbour/src/rdd/hbsix/sxtrig.prg rename to src/rdd/hbsix/sxtrig.prg diff --git a/harbour/src/rdd/hbsix/sxutil.c b/src/rdd/hbsix/sxutil.c similarity index 100% rename from harbour/src/rdd/hbsix/sxutil.c rename to src/rdd/hbsix/sxutil.c diff --git a/harbour/src/rdd/hsx/Makefile b/src/rdd/hsx/Makefile similarity index 100% rename from harbour/src/rdd/hsx/Makefile rename to src/rdd/hsx/Makefile diff --git a/harbour/src/rdd/hsx/cftsfunc.c b/src/rdd/hsx/cftsfunc.c similarity index 100% rename from harbour/src/rdd/hsx/cftsfunc.c rename to src/rdd/hsx/cftsfunc.c diff --git a/harbour/src/rdd/hsx/hsx.c b/src/rdd/hsx/hsx.c similarity index 100% rename from harbour/src/rdd/hsx/hsx.c rename to src/rdd/hsx/hsx.c diff --git a/harbour/src/rdd/nulsys/Makefile b/src/rdd/nulsys/Makefile similarity index 100% rename from harbour/src/rdd/nulsys/Makefile rename to src/rdd/nulsys/Makefile diff --git a/harbour/src/rdd/nulsys/nulsys.c b/src/rdd/nulsys/nulsys.c similarity index 100% rename from harbour/src/rdd/nulsys/nulsys.c rename to src/rdd/nulsys/nulsys.c diff --git a/harbour/src/rdd/ordcount.c b/src/rdd/ordcount.c similarity index 100% rename from harbour/src/rdd/ordcount.c rename to src/rdd/ordcount.c diff --git a/harbour/src/rdd/ordwldsk.c b/src/rdd/ordwldsk.c similarity index 100% rename from harbour/src/rdd/ordwldsk.c rename to src/rdd/ordwldsk.c diff --git a/harbour/src/rdd/rddinfo.c b/src/rdd/rddinfo.c similarity index 100% rename from harbour/src/rdd/rddinfo.c rename to src/rdd/rddinfo.c diff --git a/harbour/src/rdd/rddord.prg b/src/rdd/rddord.prg similarity index 100% rename from harbour/src/rdd/rddord.prg rename to src/rdd/rddord.prg diff --git a/harbour/src/rdd/rddordu.prg b/src/rdd/rddordu.prg similarity index 100% rename from harbour/src/rdd/rddordu.prg rename to src/rdd/rddordu.prg diff --git a/harbour/src/rdd/rddsys.prg b/src/rdd/rddsys.prg similarity index 100% rename from harbour/src/rdd/rddsys.prg rename to src/rdd/rddsys.prg diff --git a/harbour/src/rdd/sdf1.c b/src/rdd/sdf1.c similarity index 100% rename from harbour/src/rdd/sdf1.c rename to src/rdd/sdf1.c diff --git a/harbour/src/rdd/usrrdd/Makefile b/src/rdd/usrrdd/Makefile similarity index 100% rename from harbour/src/rdd/usrrdd/Makefile rename to src/rdd/usrrdd/Makefile diff --git a/harbour/src/rdd/usrrdd/rdds/Makefile b/src/rdd/usrrdd/rdds/Makefile similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/Makefile rename to src/rdd/usrrdd/rdds/Makefile diff --git a/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg b/src/rdd/usrrdd/rdds/arrayrdd.prg similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/arrayrdd.prg rename to src/rdd/usrrdd/rdds/arrayrdd.prg diff --git a/harbour/src/rdd/usrrdd/rdds/dbtcdx.prg b/src/rdd/usrrdd/rdds/dbtcdx.prg similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/dbtcdx.prg rename to src/rdd/usrrdd/rdds/dbtcdx.prg diff --git a/harbour/src/rdd/usrrdd/rdds/fptcdx.prg b/src/rdd/usrrdd/rdds/fptcdx.prg similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/fptcdx.prg rename to src/rdd/usrrdd/rdds/fptcdx.prg diff --git a/harbour/src/rdd/usrrdd/rdds/hscdx.prg b/src/rdd/usrrdd/rdds/hscdx.prg similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/hscdx.prg rename to src/rdd/usrrdd/rdds/hscdx.prg diff --git a/harbour/src/rdd/usrrdd/rdds/logrdd.prg b/src/rdd/usrrdd/rdds/logrdd.prg similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/logrdd.prg rename to src/rdd/usrrdd/rdds/logrdd.prg diff --git a/harbour/src/rdd/usrrdd/rdds/rlcdx.prg b/src/rdd/usrrdd/rdds/rlcdx.prg similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/rlcdx.prg rename to src/rdd/usrrdd/rdds/rlcdx.prg diff --git a/harbour/src/rdd/usrrdd/rdds/smtcdx.prg b/src/rdd/usrrdd/rdds/smtcdx.prg similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/smtcdx.prg rename to src/rdd/usrrdd/rdds/smtcdx.prg diff --git a/harbour/src/rdd/usrrdd/rdds/vfpcdx.prg b/src/rdd/usrrdd/rdds/vfpcdx.prg similarity index 100% rename from harbour/src/rdd/usrrdd/rdds/vfpcdx.prg rename to src/rdd/usrrdd/rdds/vfpcdx.prg diff --git a/harbour/src/rdd/usrrdd/usrrdd.c b/src/rdd/usrrdd/usrrdd.c similarity index 100% rename from harbour/src/rdd/usrrdd/usrrdd.c rename to src/rdd/usrrdd/usrrdd.c diff --git a/harbour/src/rdd/wacore.c b/src/rdd/wacore.c similarity index 100% rename from harbour/src/rdd/wacore.c rename to src/rdd/wacore.c diff --git a/harbour/src/rdd/wafunc.c b/src/rdd/wafunc.c similarity index 100% rename from harbour/src/rdd/wafunc.c rename to src/rdd/wafunc.c diff --git a/harbour/src/rdd/workarea.c b/src/rdd/workarea.c similarity index 100% rename from harbour/src/rdd/workarea.c rename to src/rdd/workarea.c diff --git a/harbour/src/rtl/Makefile b/src/rtl/Makefile similarity index 100% rename from harbour/src/rtl/Makefile rename to src/rtl/Makefile diff --git a/harbour/src/rtl/abs.c b/src/rtl/abs.c similarity index 100% rename from harbour/src/rtl/abs.c rename to src/rtl/abs.c diff --git a/harbour/src/rtl/accept.c b/src/rtl/accept.c similarity index 100% rename from harbour/src/rtl/accept.c rename to src/rtl/accept.c diff --git a/harbour/src/rtl/achoice.prg b/src/rtl/achoice.prg similarity index 100% rename from harbour/src/rtl/achoice.prg rename to src/rtl/achoice.prg diff --git a/harbour/src/rtl/adir.prg b/src/rtl/adir.prg similarity index 100% rename from harbour/src/rtl/adir.prg rename to src/rtl/adir.prg diff --git a/harbour/src/rtl/alert.prg b/src/rtl/alert.prg similarity index 100% rename from harbour/src/rtl/alert.prg rename to src/rtl/alert.prg diff --git a/harbour/src/rtl/altd.prg b/src/rtl/altd.prg similarity index 100% rename from harbour/src/rtl/altd.prg rename to src/rtl/altd.prg diff --git a/harbour/src/rtl/ampm.c b/src/rtl/ampm.c similarity index 100% rename from harbour/src/rtl/ampm.c rename to src/rtl/ampm.c diff --git a/harbour/src/rtl/arc4.c b/src/rtl/arc4.c similarity index 100% rename from harbour/src/rtl/arc4.c rename to src/rtl/arc4.c diff --git a/harbour/src/rtl/arc4.h b/src/rtl/arc4.h similarity index 100% rename from harbour/src/rtl/arc4.h rename to src/rtl/arc4.h diff --git a/harbour/src/rtl/at.c b/src/rtl/at.c similarity index 100% rename from harbour/src/rtl/at.c rename to src/rtl/at.c diff --git a/harbour/src/rtl/ati.c b/src/rtl/ati.c similarity index 100% rename from harbour/src/rtl/ati.c rename to src/rtl/ati.c diff --git a/harbour/src/rtl/base64c.c b/src/rtl/base64c.c similarity index 100% rename from harbour/src/rtl/base64c.c rename to src/rtl/base64c.c diff --git a/harbour/src/rtl/base64d.c b/src/rtl/base64d.c similarity index 100% rename from harbour/src/rtl/base64d.c rename to src/rtl/base64d.c diff --git a/harbour/src/rtl/binnum.c b/src/rtl/binnum.c similarity index 100% rename from harbour/src/rtl/binnum.c rename to src/rtl/binnum.c diff --git a/harbour/src/rtl/box.c b/src/rtl/box.c similarity index 100% rename from harbour/src/rtl/box.c rename to src/rtl/box.c diff --git a/harbour/src/rtl/browdb.prg b/src/rtl/browdb.prg similarity index 100% rename from harbour/src/rtl/browdb.prg rename to src/rtl/browdb.prg diff --git a/harbour/src/rtl/browse.prg b/src/rtl/browse.prg similarity index 100% rename from harbour/src/rtl/browse.prg rename to src/rtl/browse.prg diff --git a/harbour/src/rtl/cdpapi.c b/src/rtl/cdpapi.c similarity index 100% rename from harbour/src/rtl/cdpapi.c rename to src/rtl/cdpapi.c diff --git a/harbour/src/rtl/cdpapihb.c b/src/rtl/cdpapihb.c similarity index 100% rename from harbour/src/rtl/cdpapihb.c rename to src/rtl/cdpapihb.c diff --git a/harbour/src/rtl/cdpbox.c b/src/rtl/cdpbox.c similarity index 100% rename from harbour/src/rtl/cdpbox.c rename to src/rtl/cdpbox.c diff --git a/harbour/src/rtl/cdpdet.prg b/src/rtl/cdpdet.prg similarity index 100% rename from harbour/src/rtl/cdpdet.prg rename to src/rtl/cdpdet.prg diff --git a/harbour/src/rtl/cdpdetc.c b/src/rtl/cdpdetc.c similarity index 100% rename from harbour/src/rtl/cdpdetc.c rename to src/rtl/cdpdetc.c diff --git a/harbour/src/rtl/checkbox.prg b/src/rtl/checkbox.prg similarity index 100% rename from harbour/src/rtl/checkbox.prg rename to src/rtl/checkbox.prg diff --git a/harbour/src/rtl/chrasc.c b/src/rtl/chrasc.c similarity index 100% rename from harbour/src/rtl/chrasc.c rename to src/rtl/chrasc.c diff --git a/harbour/src/rtl/chruni.c b/src/rtl/chruni.c similarity index 100% rename from harbour/src/rtl/chruni.c rename to src/rtl/chruni.c diff --git a/harbour/src/rtl/color53.prg b/src/rtl/color53.prg similarity index 100% rename from harbour/src/rtl/color53.prg rename to src/rtl/color53.prg diff --git a/harbour/src/rtl/colorind.c b/src/rtl/colorind.c similarity index 100% rename from harbour/src/rtl/colorind.c rename to src/rtl/colorind.c diff --git a/harbour/src/rtl/console.c b/src/rtl/console.c similarity index 100% rename from harbour/src/rtl/console.c rename to src/rtl/console.c diff --git a/harbour/src/rtl/copyfile.c b/src/rtl/copyfile.c similarity index 100% rename from harbour/src/rtl/copyfile.c rename to src/rtl/copyfile.c diff --git a/harbour/src/rtl/cputime.c b/src/rtl/cputime.c similarity index 100% rename from harbour/src/rtl/cputime.c rename to src/rtl/cputime.c diff --git a/harbour/src/rtl/datec.c b/src/rtl/datec.c similarity index 100% rename from harbour/src/rtl/datec.c rename to src/rtl/datec.c diff --git a/harbour/src/rtl/dates.c b/src/rtl/dates.c similarity index 100% rename from harbour/src/rtl/dates.c rename to src/rtl/dates.c diff --git a/harbour/src/rtl/dateshb.c b/src/rtl/dateshb.c similarity index 100% rename from harbour/src/rtl/dateshb.c rename to src/rtl/dateshb.c diff --git a/harbour/src/rtl/datesx.c b/src/rtl/datesx.c similarity index 100% rename from harbour/src/rtl/datesx.c rename to src/rtl/datesx.c diff --git a/harbour/src/rtl/dbedit.prg b/src/rtl/dbedit.prg similarity index 100% rename from harbour/src/rtl/dbedit.prg rename to src/rtl/dbedit.prg diff --git a/harbour/src/rtl/defpath.c b/src/rtl/defpath.c similarity index 100% rename from harbour/src/rtl/defpath.c rename to src/rtl/defpath.c diff --git a/harbour/src/rtl/defpathu.c b/src/rtl/defpathu.c similarity index 100% rename from harbour/src/rtl/defpathu.c rename to src/rtl/defpathu.c diff --git a/harbour/src/rtl/descend.c b/src/rtl/descend.c similarity index 100% rename from harbour/src/rtl/descend.c rename to src/rtl/descend.c diff --git a/harbour/src/rtl/devoutp.prg b/src/rtl/devoutp.prg similarity index 100% rename from harbour/src/rtl/devoutp.prg rename to src/rtl/devoutp.prg diff --git a/harbour/src/rtl/dircmd.prg b/src/rtl/dircmd.prg similarity index 100% rename from harbour/src/rtl/dircmd.prg rename to src/rtl/dircmd.prg diff --git a/harbour/src/rtl/dirdrive.c b/src/rtl/dirdrive.c similarity index 100% rename from harbour/src/rtl/dirdrive.c rename to src/rtl/dirdrive.c diff --git a/harbour/src/rtl/direct.c b/src/rtl/direct.c similarity index 100% rename from harbour/src/rtl/direct.c rename to src/rtl/direct.c diff --git a/harbour/src/rtl/dirscan.prg b/src/rtl/dirscan.prg similarity index 100% rename from harbour/src/rtl/dirscan.prg rename to src/rtl/dirscan.prg diff --git a/harbour/src/rtl/diskspac.c b/src/rtl/diskspac.c similarity index 100% rename from harbour/src/rtl/diskspac.c rename to src/rtl/diskspac.c diff --git a/harbour/src/rtl/disksphb.c b/src/rtl/disksphb.c similarity index 100% rename from harbour/src/rtl/disksphb.c rename to src/rtl/disksphb.c diff --git a/harbour/src/rtl/do.c b/src/rtl/do.c similarity index 100% rename from harbour/src/rtl/do.c rename to src/rtl/do.c diff --git a/harbour/src/rtl/einstv52.prg b/src/rtl/einstv52.prg similarity index 100% rename from harbour/src/rtl/einstv52.prg rename to src/rtl/einstv52.prg diff --git a/harbour/src/rtl/einstvar.prg b/src/rtl/einstvar.prg similarity index 100% rename from harbour/src/rtl/einstvar.prg rename to src/rtl/einstvar.prg diff --git a/harbour/src/rtl/einstvau.prg b/src/rtl/einstvau.prg similarity index 100% rename from harbour/src/rtl/einstvau.prg rename to src/rtl/einstvau.prg diff --git a/harbour/src/rtl/empty.c b/src/rtl/empty.c similarity index 100% rename from harbour/src/rtl/empty.c rename to src/rtl/empty.c diff --git a/harbour/src/rtl/errapi.c b/src/rtl/errapi.c similarity index 100% rename from harbour/src/rtl/errapi.c rename to src/rtl/errapi.c diff --git a/harbour/src/rtl/errapiu.c b/src/rtl/errapiu.c similarity index 100% rename from harbour/src/rtl/errapiu.c rename to src/rtl/errapiu.c diff --git a/harbour/src/rtl/errint.c b/src/rtl/errint.c similarity index 100% rename from harbour/src/rtl/errint.c rename to src/rtl/errint.c diff --git a/harbour/src/rtl/errintlo.c b/src/rtl/errintlo.c similarity index 100% rename from harbour/src/rtl/errintlo.c rename to src/rtl/errintlo.c diff --git a/harbour/src/rtl/errsys.prg b/src/rtl/errsys.prg similarity index 100% rename from harbour/src/rtl/errsys.prg rename to src/rtl/errsys.prg diff --git a/harbour/src/rtl/file.c b/src/rtl/file.c similarity index 100% rename from harbour/src/rtl/file.c rename to src/rtl/file.c diff --git a/harbour/src/rtl/filebuf.c b/src/rtl/filebuf.c similarity index 100% rename from harbour/src/rtl/filebuf.c rename to src/rtl/filebuf.c diff --git a/harbour/src/rtl/filehb.c b/src/rtl/filehb.c similarity index 100% rename from harbour/src/rtl/filehb.c rename to src/rtl/filehb.c diff --git a/harbour/src/rtl/filesys.c b/src/rtl/filesys.c similarity index 100% rename from harbour/src/rtl/filesys.c rename to src/rtl/filesys.c diff --git a/harbour/src/rtl/fkmax.c b/src/rtl/fkmax.c similarity index 100% rename from harbour/src/rtl/fkmax.c rename to src/rtl/fkmax.c diff --git a/harbour/src/rtl/fmhb.c b/src/rtl/fmhb.c similarity index 100% rename from harbour/src/rtl/fmhb.c rename to src/rtl/fmhb.c diff --git a/harbour/src/rtl/fnsplit.c b/src/rtl/fnsplit.c similarity index 100% rename from harbour/src/rtl/fnsplit.c rename to src/rtl/fnsplit.c diff --git a/harbour/src/rtl/fscopy.c b/src/rtl/fscopy.c similarity index 100% rename from harbour/src/rtl/fscopy.c rename to src/rtl/fscopy.c diff --git a/harbour/src/rtl/fserr.c b/src/rtl/fserr.c similarity index 100% rename from harbour/src/rtl/fserr.c rename to src/rtl/fserr.c diff --git a/harbour/src/rtl/fslink.c b/src/rtl/fslink.c similarity index 100% rename from harbour/src/rtl/fslink.c rename to src/rtl/fslink.c diff --git a/harbour/src/rtl/fssize.c b/src/rtl/fssize.c similarity index 100% rename from harbour/src/rtl/fssize.c rename to src/rtl/fssize.c diff --git a/harbour/src/rtl/fstemp.c b/src/rtl/fstemp.c similarity index 100% rename from harbour/src/rtl/fstemp.c rename to src/rtl/fstemp.c diff --git a/harbour/src/rtl/gete.c b/src/rtl/gete.c similarity index 100% rename from harbour/src/rtl/gete.c rename to src/rtl/gete.c diff --git a/harbour/src/rtl/getlist.prg b/src/rtl/getlist.prg similarity index 100% rename from harbour/src/rtl/getlist.prg rename to src/rtl/getlist.prg diff --git a/harbour/src/rtl/getsys.prg b/src/rtl/getsys.prg similarity index 100% rename from harbour/src/rtl/getsys.prg rename to src/rtl/getsys.prg diff --git a/harbour/src/rtl/getsys53.prg b/src/rtl/getsys53.prg similarity index 100% rename from harbour/src/rtl/getsys53.prg rename to src/rtl/getsys53.prg diff --git a/harbour/src/rtl/getsyshb.prg b/src/rtl/getsyshb.prg similarity index 100% rename from harbour/src/rtl/getsyshb.prg rename to src/rtl/getsyshb.prg diff --git a/harbour/src/rtl/gt.c b/src/rtl/gt.c similarity index 100% rename from harbour/src/rtl/gt.c rename to src/rtl/gt.c diff --git a/harbour/src/rtl/gt_tpl/Makefile b/src/rtl/gt_tpl/Makefile similarity index 100% rename from harbour/src/rtl/gt_tpl/Makefile rename to src/rtl/gt_tpl/Makefile diff --git a/harbour/src/rtl/gt_tpl/gt_tpl.c b/src/rtl/gt_tpl/gt_tpl.c similarity index 100% rename from harbour/src/rtl/gt_tpl/gt_tpl.c rename to src/rtl/gt_tpl/gt_tpl.c diff --git a/harbour/src/rtl/gtapi.c b/src/rtl/gtapi.c similarity index 100% rename from harbour/src/rtl/gtapi.c rename to src/rtl/gtapi.c diff --git a/harbour/src/rtl/gtapiu.c b/src/rtl/gtapiu.c similarity index 100% rename from harbour/src/rtl/gtapiu.c rename to src/rtl/gtapiu.c diff --git a/harbour/src/rtl/gtcgi/Makefile b/src/rtl/gtcgi/Makefile similarity index 100% rename from harbour/src/rtl/gtcgi/Makefile rename to src/rtl/gtcgi/Makefile diff --git a/harbour/src/rtl/gtcgi/gtcgi.c b/src/rtl/gtcgi/gtcgi.c similarity index 100% rename from harbour/src/rtl/gtcgi/gtcgi.c rename to src/rtl/gtcgi/gtcgi.c diff --git a/harbour/src/rtl/gtchrmap.c b/src/rtl/gtchrmap.c similarity index 100% rename from harbour/src/rtl/gtchrmap.c rename to src/rtl/gtchrmap.c diff --git a/harbour/src/rtl/gtclip.c b/src/rtl/gtclip.c similarity index 100% rename from harbour/src/rtl/gtclip.c rename to src/rtl/gtclip.c diff --git a/harbour/src/rtl/gtcrs/Makefile b/src/rtl/gtcrs/Makefile similarity index 100% rename from harbour/src/rtl/gtcrs/Makefile rename to src/rtl/gtcrs/Makefile diff --git a/harbour/src/rtl/gtcrs/gtcrs.c b/src/rtl/gtcrs/gtcrs.c similarity index 100% rename from harbour/src/rtl/gtcrs/gtcrs.c rename to src/rtl/gtcrs/gtcrs.c diff --git a/harbour/src/rtl/gtcrs/gtcrs.h b/src/rtl/gtcrs/gtcrs.h similarity index 100% rename from harbour/src/rtl/gtcrs/gtcrs.h rename to src/rtl/gtcrs/gtcrs.h diff --git a/harbour/src/rtl/gtcrs/hb-charmap.def b/src/rtl/gtcrs/hb-charmap.def similarity index 100% rename from harbour/src/rtl/gtcrs/hb-charmap.def rename to src/rtl/gtcrs/hb-charmap.def diff --git a/harbour/src/rtl/gtdos/Makefile b/src/rtl/gtdos/Makefile similarity index 100% rename from harbour/src/rtl/gtdos/Makefile rename to src/rtl/gtdos/Makefile diff --git a/harbour/src/rtl/gtdos/gtdos.c b/src/rtl/gtdos/gtdos.c similarity index 100% rename from harbour/src/rtl/gtdos/gtdos.c rename to src/rtl/gtdos/gtdos.c diff --git a/harbour/src/rtl/gtfunc.c b/src/rtl/gtfunc.c similarity index 100% rename from harbour/src/rtl/gtfunc.c rename to src/rtl/gtfunc.c diff --git a/harbour/src/rtl/gtgui/Makefile b/src/rtl/gtgui/Makefile similarity index 100% rename from harbour/src/rtl/gtgui/Makefile rename to src/rtl/gtgui/Makefile diff --git a/harbour/src/rtl/gtgui/gtgui.c b/src/rtl/gtgui/gtgui.c similarity index 100% rename from harbour/src/rtl/gtgui/gtgui.c rename to src/rtl/gtgui/gtgui.c diff --git a/harbour/src/rtl/gtkbstat.c b/src/rtl/gtkbstat.c similarity index 100% rename from harbour/src/rtl/gtkbstat.c rename to src/rtl/gtkbstat.c diff --git a/harbour/src/rtl/gtkeycod.c b/src/rtl/gtkeycod.c similarity index 100% rename from harbour/src/rtl/gtkeycod.c rename to src/rtl/gtkeycod.c diff --git a/harbour/src/rtl/gtos2/Makefile b/src/rtl/gtos2/Makefile similarity index 100% rename from harbour/src/rtl/gtos2/Makefile rename to src/rtl/gtos2/Makefile diff --git a/harbour/src/rtl/gtos2/gtos2.c b/src/rtl/gtos2/gtos2.c similarity index 100% rename from harbour/src/rtl/gtos2/gtos2.c rename to src/rtl/gtos2/gtos2.c diff --git a/harbour/src/rtl/gtpca/Makefile b/src/rtl/gtpca/Makefile similarity index 100% rename from harbour/src/rtl/gtpca/Makefile rename to src/rtl/gtpca/Makefile diff --git a/harbour/src/rtl/gtpca/gtpca.c b/src/rtl/gtpca/gtpca.c similarity index 100% rename from harbour/src/rtl/gtpca/gtpca.c rename to src/rtl/gtpca/gtpca.c diff --git a/harbour/src/rtl/gtsln/Makefile b/src/rtl/gtsln/Makefile similarity index 100% rename from harbour/src/rtl/gtsln/Makefile rename to src/rtl/gtsln/Makefile diff --git a/harbour/src/rtl/gtsln/gtsln.c b/src/rtl/gtsln/gtsln.c similarity index 100% rename from harbour/src/rtl/gtsln/gtsln.c rename to src/rtl/gtsln/gtsln.c diff --git a/harbour/src/rtl/gtsln/gtsln.h b/src/rtl/gtsln/gtsln.h similarity index 100% rename from harbour/src/rtl/gtsln/gtsln.h rename to src/rtl/gtsln/gtsln.h diff --git a/harbour/src/rtl/gtsln/kbsln.c b/src/rtl/gtsln/kbsln.c similarity index 100% rename from harbour/src/rtl/gtsln/kbsln.c rename to src/rtl/gtsln/kbsln.c diff --git a/harbour/src/rtl/gtsln/keytrans.c b/src/rtl/gtsln/keytrans.c similarity index 100% rename from harbour/src/rtl/gtsln/keytrans.c rename to src/rtl/gtsln/keytrans.c diff --git a/harbour/src/rtl/gtsln/mousesln.c b/src/rtl/gtsln/mousesln.c similarity index 100% rename from harbour/src/rtl/gtsln/mousesln.c rename to src/rtl/gtsln/mousesln.c diff --git a/harbour/src/rtl/gtstd/Makefile b/src/rtl/gtstd/Makefile similarity index 100% rename from harbour/src/rtl/gtstd/Makefile rename to src/rtl/gtstd/Makefile diff --git a/harbour/src/rtl/gtstd/gtstd.c b/src/rtl/gtstd/gtstd.c similarity index 100% rename from harbour/src/rtl/gtstd/gtstd.c rename to src/rtl/gtstd/gtstd.c diff --git a/harbour/src/rtl/gtsys.c b/src/rtl/gtsys.c similarity index 100% rename from harbour/src/rtl/gtsys.c rename to src/rtl/gtsys.c diff --git a/harbour/src/rtl/gttone.c b/src/rtl/gttone.c similarity index 100% rename from harbour/src/rtl/gttone.c rename to src/rtl/gttone.c diff --git a/harbour/src/rtl/gttrm/Makefile b/src/rtl/gttrm/Makefile similarity index 100% rename from harbour/src/rtl/gttrm/Makefile rename to src/rtl/gttrm/Makefile diff --git a/harbour/src/rtl/gttrm/gttrm.c b/src/rtl/gttrm/gttrm.c similarity index 100% rename from harbour/src/rtl/gttrm/gttrm.c rename to src/rtl/gttrm/gttrm.c diff --git a/harbour/src/rtl/gtwin/Makefile b/src/rtl/gtwin/Makefile similarity index 100% rename from harbour/src/rtl/gtwin/Makefile rename to src/rtl/gtwin/Makefile diff --git a/harbour/src/rtl/gtwin/gtwin.c b/src/rtl/gtwin/gtwin.c similarity index 100% rename from harbour/src/rtl/gtwin/gtwin.c rename to src/rtl/gtwin/gtwin.c diff --git a/harbour/src/rtl/gtwvt/Makefile b/src/rtl/gtwvt/Makefile similarity index 100% rename from harbour/src/rtl/gtwvt/Makefile rename to src/rtl/gtwvt/Makefile diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/src/rtl/gtwvt/gtwvt.c similarity index 100% rename from harbour/src/rtl/gtwvt/gtwvt.c rename to src/rtl/gtwvt/gtwvt.c diff --git a/harbour/src/rtl/gtwvt/gtwvt.h b/src/rtl/gtwvt/gtwvt.h similarity index 100% rename from harbour/src/rtl/gtwvt/gtwvt.h rename to src/rtl/gtwvt/gtwvt.h diff --git a/harbour/src/rtl/gtxwc/Makefile b/src/rtl/gtxwc/Makefile similarity index 100% rename from harbour/src/rtl/gtxwc/Makefile rename to src/rtl/gtxwc/Makefile diff --git a/harbour/src/rtl/gtxwc/gtxwc.c b/src/rtl/gtxwc/gtxwc.c similarity index 100% rename from harbour/src/rtl/gtxwc/gtxwc.c rename to src/rtl/gtxwc/gtxwc.c diff --git a/harbour/src/rtl/gtxwc/gtxwc.h b/src/rtl/gtxwc/gtxwc.h similarity index 100% rename from harbour/src/rtl/gtxwc/gtxwc.h rename to src/rtl/gtxwc/gtxwc.h diff --git a/harbour/src/rtl/gui.prg b/src/rtl/gui.prg similarity index 100% rename from harbour/src/rtl/gui.prg rename to src/rtl/gui.prg diff --git a/harbour/src/rtl/gx.c b/src/rtl/gx.c similarity index 100% rename from harbour/src/rtl/gx.c rename to src/rtl/gx.c diff --git a/harbour/src/rtl/hardcr.c b/src/rtl/hardcr.c similarity index 100% rename from harbour/src/rtl/hardcr.c rename to src/rtl/hardcr.c diff --git a/harbour/src/rtl/hbadler.c b/src/rtl/hbadler.c similarity index 100% rename from harbour/src/rtl/hbadler.c rename to src/rtl/hbadler.c diff --git a/harbour/src/rtl/hbascii.c b/src/rtl/hbascii.c similarity index 100% rename from harbour/src/rtl/hbascii.c rename to src/rtl/hbascii.c diff --git a/harbour/src/rtl/hbbffnc.c b/src/rtl/hbbffnc.c similarity index 100% rename from harbour/src/rtl/hbbffnc.c rename to src/rtl/hbbffnc.c diff --git a/harbour/src/rtl/hbbfish.c b/src/rtl/hbbfish.c similarity index 100% rename from harbour/src/rtl/hbbfish.c rename to src/rtl/hbbfish.c diff --git a/harbour/src/rtl/hbbit.c b/src/rtl/hbbit.c similarity index 100% rename from harbour/src/rtl/hbbit.c rename to src/rtl/hbbit.c diff --git a/harbour/src/rtl/hbbyte.c b/src/rtl/hbbyte.c similarity index 100% rename from harbour/src/rtl/hbbyte.c rename to src/rtl/hbbyte.c diff --git a/harbour/src/rtl/hbcom.c b/src/rtl/hbcom.c similarity index 100% rename from harbour/src/rtl/hbcom.c rename to src/rtl/hbcom.c diff --git a/harbour/src/rtl/hbcomhb.c b/src/rtl/hbcomhb.c similarity index 100% rename from harbour/src/rtl/hbcomhb.c rename to src/rtl/hbcomhb.c diff --git a/harbour/src/rtl/hbcrc.c b/src/rtl/hbcrc.c similarity index 100% rename from harbour/src/rtl/hbcrc.c rename to src/rtl/hbcrc.c diff --git a/harbour/src/rtl/hbdef.c b/src/rtl/hbdef.c similarity index 100% rename from harbour/src/rtl/hbdef.c rename to src/rtl/hbdef.c diff --git a/harbour/src/rtl/hbdoc.prg b/src/rtl/hbdoc.prg similarity index 100% rename from harbour/src/rtl/hbdoc.prg rename to src/rtl/hbdoc.prg diff --git a/harbour/src/rtl/hbdyn.c b/src/rtl/hbdyn.c similarity index 100% rename from harbour/src/rtl/hbdyn.c rename to src/rtl/hbdyn.c diff --git a/harbour/src/rtl/hbdynhb.c b/src/rtl/hbdynhb.c similarity index 100% rename from harbour/src/rtl/hbdynhb.c rename to src/rtl/hbdynhb.c diff --git a/harbour/src/rtl/hbfeof.c b/src/rtl/hbfeof.c similarity index 100% rename from harbour/src/rtl/hbfeof.c rename to src/rtl/hbfeof.c diff --git a/harbour/src/rtl/hbfile.c b/src/rtl/hbfile.c similarity index 100% rename from harbour/src/rtl/hbfile.c rename to src/rtl/hbfile.c diff --git a/harbour/src/rtl/hbfilehc.c b/src/rtl/hbfilehc.c similarity index 100% rename from harbour/src/rtl/hbfilehc.c rename to src/rtl/hbfilehc.c diff --git a/harbour/src/rtl/hbfilehi.prg b/src/rtl/hbfilehi.prg similarity index 100% rename from harbour/src/rtl/hbfilehi.prg rename to src/rtl/hbfilehi.prg diff --git a/harbour/src/rtl/hbgtcore.c b/src/rtl/hbgtcore.c similarity index 100% rename from harbour/src/rtl/hbgtcore.c rename to src/rtl/hbgtcore.c diff --git a/harbour/src/rtl/hbhex.c b/src/rtl/hbhex.c similarity index 100% rename from harbour/src/rtl/hbhex.c rename to src/rtl/hbhex.c diff --git a/harbour/src/rtl/hbi18n1.c b/src/rtl/hbi18n1.c similarity index 100% rename from harbour/src/rtl/hbi18n1.c rename to src/rtl/hbi18n1.c diff --git a/harbour/src/rtl/hbi18n2.prg b/src/rtl/hbi18n2.prg similarity index 100% rename from harbour/src/rtl/hbi18n2.prg rename to src/rtl/hbi18n2.prg diff --git a/harbour/src/rtl/hbinet.c b/src/rtl/hbinet.c similarity index 100% rename from harbour/src/rtl/hbinet.c rename to src/rtl/hbinet.c diff --git a/harbour/src/rtl/hbinetz.c b/src/rtl/hbinetz.c similarity index 100% rename from harbour/src/rtl/hbinetz.c rename to src/rtl/hbinetz.c diff --git a/harbour/src/rtl/hbini.prg b/src/rtl/hbini.prg similarity index 100% rename from harbour/src/rtl/hbini.prg rename to src/rtl/hbini.prg diff --git a/harbour/src/rtl/hbjson.c b/src/rtl/hbjson.c similarity index 100% rename from harbour/src/rtl/hbjson.c rename to src/rtl/hbjson.c diff --git a/harbour/src/rtl/hblpp.c b/src/rtl/hblpp.c similarity index 100% rename from harbour/src/rtl/hblpp.c rename to src/rtl/hblpp.c diff --git a/harbour/src/rtl/hblpphb.c b/src/rtl/hblpphb.c similarity index 100% rename from harbour/src/rtl/hblpphb.c rename to src/rtl/hblpphb.c diff --git a/harbour/src/rtl/hbmd5.c b/src/rtl/hbmd5.c similarity index 100% rename from harbour/src/rtl/hbmd5.c rename to src/rtl/hbmd5.c diff --git a/harbour/src/rtl/hbmd5enc.c b/src/rtl/hbmd5enc.c similarity index 100% rename from harbour/src/rtl/hbmd5enc.c rename to src/rtl/hbmd5enc.c diff --git a/harbour/src/rtl/hbntos.c b/src/rtl/hbntos.c similarity index 100% rename from harbour/src/rtl/hbntos.c rename to src/rtl/hbntos.c diff --git a/harbour/src/rtl/hbproces.c b/src/rtl/hbproces.c similarity index 100% rename from harbour/src/rtl/hbproces.c rename to src/rtl/hbproces.c diff --git a/harbour/src/rtl/hbprocfn.c b/src/rtl/hbprocfn.c similarity index 100% rename from harbour/src/rtl/hbprocfn.c rename to src/rtl/hbprocfn.c diff --git a/harbour/src/rtl/hbrand.c b/src/rtl/hbrand.c similarity index 100% rename from harbour/src/rtl/hbrand.c rename to src/rtl/hbrand.c diff --git a/harbour/src/rtl/hbrandom.c b/src/rtl/hbrandom.c similarity index 100% rename from harbour/src/rtl/hbrandom.c rename to src/rtl/hbrandom.c diff --git a/harbour/src/rtl/hbregex.c b/src/rtl/hbregex.c similarity index 100% rename from harbour/src/rtl/hbregex.c rename to src/rtl/hbregex.c diff --git a/harbour/src/rtl/hbregexc.c b/src/rtl/hbregexc.c similarity index 100% rename from harbour/src/rtl/hbregexc.c rename to src/rtl/hbregexc.c diff --git a/harbour/src/rtl/hbrunfun.c b/src/rtl/hbrunfun.c similarity index 100% rename from harbour/src/rtl/hbrunfun.c rename to src/rtl/hbrunfun.c diff --git a/harbour/src/rtl/hbsha1.c b/src/rtl/hbsha1.c similarity index 100% rename from harbour/src/rtl/hbsha1.c rename to src/rtl/hbsha1.c diff --git a/harbour/src/rtl/hbsha1hm.c b/src/rtl/hbsha1hm.c similarity index 100% rename from harbour/src/rtl/hbsha1hm.c rename to src/rtl/hbsha1hm.c diff --git a/harbour/src/rtl/hbsha2.c b/src/rtl/hbsha2.c similarity index 100% rename from harbour/src/rtl/hbsha2.c rename to src/rtl/hbsha2.c diff --git a/harbour/src/rtl/hbsha2hm.c b/src/rtl/hbsha2hm.c similarity index 100% rename from harbour/src/rtl/hbsha2hm.c rename to src/rtl/hbsha2hm.c diff --git a/harbour/src/rtl/hbsocket.c b/src/rtl/hbsocket.c similarity index 100% rename from harbour/src/rtl/hbsocket.c rename to src/rtl/hbsocket.c diff --git a/harbour/src/rtl/hbsockhb.c b/src/rtl/hbsockhb.c similarity index 100% rename from harbour/src/rtl/hbsockhb.c rename to src/rtl/hbsockhb.c diff --git a/harbour/src/rtl/hbstrfmt.c b/src/rtl/hbstrfmt.c similarity index 100% rename from harbour/src/rtl/hbstrfmt.c rename to src/rtl/hbstrfmt.c diff --git a/harbour/src/rtl/hbstrsh.c b/src/rtl/hbstrsh.c similarity index 100% rename from harbour/src/rtl/hbstrsh.c rename to src/rtl/hbstrsh.c diff --git a/harbour/src/rtl/hbtoken.c b/src/rtl/hbtoken.c similarity index 100% rename from harbour/src/rtl/hbtoken.c rename to src/rtl/hbtoken.c diff --git a/harbour/src/rtl/hbzlib.c b/src/rtl/hbzlib.c similarity index 100% rename from harbour/src/rtl/hbzlib.c rename to src/rtl/hbzlib.c diff --git a/harbour/src/rtl/hbzlibgz.c b/src/rtl/hbzlibgz.c similarity index 100% rename from harbour/src/rtl/hbzlibgz.c rename to src/rtl/hbzlibgz.c diff --git a/harbour/src/rtl/hbznet.c b/src/rtl/hbznet.c similarity index 100% rename from harbour/src/rtl/hbznet.c rename to src/rtl/hbznet.c diff --git a/harbour/src/rtl/idle.c b/src/rtl/idle.c similarity index 100% rename from harbour/src/rtl/idle.c rename to src/rtl/idle.c diff --git a/harbour/src/rtl/inkey.c b/src/rtl/inkey.c similarity index 100% rename from harbour/src/rtl/inkey.c rename to src/rtl/inkey.c diff --git a/harbour/src/rtl/inkeyapi.c b/src/rtl/inkeyapi.c similarity index 100% rename from harbour/src/rtl/inkeyapi.c rename to src/rtl/inkeyapi.c diff --git a/harbour/src/rtl/input.prg b/src/rtl/input.prg similarity index 100% rename from harbour/src/rtl/input.prg rename to src/rtl/input.prg diff --git a/harbour/src/rtl/is.c b/src/rtl/is.c similarity index 100% rename from harbour/src/rtl/is.c rename to src/rtl/is.c diff --git a/harbour/src/rtl/isprint.c b/src/rtl/isprint.c similarity index 100% rename from harbour/src/rtl/isprint.c rename to src/rtl/isprint.c diff --git a/harbour/src/rtl/itemseri.c b/src/rtl/itemseri.c similarity index 100% rename from harbour/src/rtl/itemseri.c rename to src/rtl/itemseri.c diff --git a/harbour/src/rtl/lang.c b/src/rtl/lang.c similarity index 100% rename from harbour/src/rtl/lang.c rename to src/rtl/lang.c diff --git a/harbour/src/rtl/langapi.c b/src/rtl/langapi.c similarity index 100% rename from harbour/src/rtl/langapi.c rename to src/rtl/langapi.c diff --git a/harbour/src/rtl/langcomp.prg b/src/rtl/langcomp.prg similarity index 100% rename from harbour/src/rtl/langcomp.prg rename to src/rtl/langcomp.prg diff --git a/harbour/src/rtl/langlgcy.prg b/src/rtl/langlgcy.prg similarity index 100% rename from harbour/src/rtl/langlgcy.prg rename to src/rtl/langlgcy.prg diff --git a/harbour/src/rtl/left.c b/src/rtl/left.c similarity index 100% rename from harbour/src/rtl/left.c rename to src/rtl/left.c diff --git a/harbour/src/rtl/len.c b/src/rtl/len.c similarity index 100% rename from harbour/src/rtl/len.c rename to src/rtl/len.c diff --git a/harbour/src/rtl/lennum.c b/src/rtl/lennum.c similarity index 100% rename from harbour/src/rtl/lennum.c rename to src/rtl/lennum.c diff --git a/harbour/src/rtl/libname.prg b/src/rtl/libname.prg similarity index 100% rename from harbour/src/rtl/libname.prg rename to src/rtl/libname.prg diff --git a/harbour/src/rtl/libnamec.c b/src/rtl/libnamec.c similarity index 100% rename from harbour/src/rtl/libnamec.c rename to src/rtl/libnamec.c diff --git a/harbour/src/rtl/listbox.prg b/src/rtl/listbox.prg similarity index 100% rename from harbour/src/rtl/listbox.prg rename to src/rtl/listbox.prg diff --git a/harbour/src/rtl/math.c b/src/rtl/math.c similarity index 100% rename from harbour/src/rtl/math.c rename to src/rtl/math.c diff --git a/harbour/src/rtl/maxrow.c b/src/rtl/maxrow.c similarity index 100% rename from harbour/src/rtl/maxrow.c rename to src/rtl/maxrow.c diff --git a/harbour/src/rtl/memoedit.prg b/src/rtl/memoedit.prg similarity index 100% rename from harbour/src/rtl/memoedit.prg rename to src/rtl/memoedit.prg diff --git a/harbour/src/rtl/memofile.c b/src/rtl/memofile.c similarity index 100% rename from harbour/src/rtl/memofile.c rename to src/rtl/memofile.c diff --git a/harbour/src/rtl/memvarbl.prg b/src/rtl/memvarbl.prg similarity index 100% rename from harbour/src/rtl/memvarbl.prg rename to src/rtl/memvarbl.prg diff --git a/harbour/src/rtl/memvarhb.prg b/src/rtl/memvarhb.prg similarity index 100% rename from harbour/src/rtl/memvarhb.prg rename to src/rtl/memvarhb.prg diff --git a/harbour/src/rtl/menusys.prg b/src/rtl/menusys.prg similarity index 100% rename from harbour/src/rtl/menusys.prg rename to src/rtl/menusys.prg diff --git a/harbour/src/rtl/menuto.prg b/src/rtl/menuto.prg similarity index 100% rename from harbour/src/rtl/menuto.prg rename to src/rtl/menuto.prg diff --git a/harbour/src/rtl/minmax.c b/src/rtl/minmax.c similarity index 100% rename from harbour/src/rtl/minmax.c rename to src/rtl/minmax.c diff --git a/harbour/src/rtl/mlcfunc.c b/src/rtl/mlcfunc.c similarity index 100% rename from harbour/src/rtl/mlcfunc.c rename to src/rtl/mlcfunc.c diff --git a/harbour/src/rtl/mod.c b/src/rtl/mod.c similarity index 100% rename from harbour/src/rtl/mod.c rename to src/rtl/mod.c diff --git a/harbour/src/rtl/mouse53.c b/src/rtl/mouse53.c similarity index 100% rename from harbour/src/rtl/mouse53.c rename to src/rtl/mouse53.c diff --git a/harbour/src/rtl/mouseapi.c b/src/rtl/mouseapi.c similarity index 100% rename from harbour/src/rtl/mouseapi.c rename to src/rtl/mouseapi.c diff --git a/harbour/src/rtl/mousehb.c b/src/rtl/mousehb.c similarity index 100% rename from harbour/src/rtl/mousehb.c rename to src/rtl/mousehb.c diff --git a/harbour/src/rtl/mtran.c b/src/rtl/mtran.c similarity index 100% rename from harbour/src/rtl/mtran.c rename to src/rtl/mtran.c diff --git a/harbour/src/rtl/natmsg.c b/src/rtl/natmsg.c similarity index 100% rename from harbour/src/rtl/natmsg.c rename to src/rtl/natmsg.c diff --git a/harbour/src/rtl/natmsgu.c b/src/rtl/natmsgu.c similarity index 100% rename from harbour/src/rtl/natmsgu.c rename to src/rtl/natmsgu.c diff --git a/harbour/src/rtl/net.c b/src/rtl/net.c similarity index 100% rename from harbour/src/rtl/net.c rename to src/rtl/net.c diff --git a/harbour/src/rtl/objfunc.prg b/src/rtl/objfunc.prg similarity index 100% rename from harbour/src/rtl/objfunc.prg rename to src/rtl/objfunc.prg diff --git a/harbour/src/rtl/oemansi.c b/src/rtl/oemansi.c similarity index 100% rename from harbour/src/rtl/oemansi.c rename to src/rtl/oemansi.c diff --git a/harbour/src/rtl/oldbox.c b/src/rtl/oldbox.c similarity index 100% rename from harbour/src/rtl/oldbox.c rename to src/rtl/oldbox.c diff --git a/harbour/src/rtl/oldclear.c b/src/rtl/oldclear.c similarity index 100% rename from harbour/src/rtl/oldclear.c rename to src/rtl/oldclear.c diff --git a/harbour/src/rtl/pad.c b/src/rtl/pad.c similarity index 100% rename from harbour/src/rtl/pad.c rename to src/rtl/pad.c diff --git a/harbour/src/rtl/padc.c b/src/rtl/padc.c similarity index 100% rename from harbour/src/rtl/padc.c rename to src/rtl/padc.c diff --git a/harbour/src/rtl/padl.c b/src/rtl/padl.c similarity index 100% rename from harbour/src/rtl/padl.c rename to src/rtl/padl.c diff --git a/harbour/src/rtl/padr.c b/src/rtl/padr.c similarity index 100% rename from harbour/src/rtl/padr.c rename to src/rtl/padr.c diff --git a/harbour/src/rtl/perfuncs.prg b/src/rtl/perfuncs.prg similarity index 100% rename from harbour/src/rtl/perfuncs.prg rename to src/rtl/perfuncs.prg diff --git a/harbour/src/rtl/philes.c b/src/rtl/philes.c similarity index 100% rename from harbour/src/rtl/philes.c rename to src/rtl/philes.c diff --git a/harbour/src/rtl/philes53.c b/src/rtl/philes53.c similarity index 100% rename from harbour/src/rtl/philes53.c rename to src/rtl/philes53.c diff --git a/harbour/src/rtl/profiler.prg b/src/rtl/profiler.prg similarity index 100% rename from harbour/src/rtl/profiler.prg rename to src/rtl/profiler.prg diff --git a/harbour/src/rtl/pushbtn.prg b/src/rtl/pushbtn.prg similarity index 100% rename from harbour/src/rtl/pushbtn.prg rename to src/rtl/pushbtn.prg diff --git a/harbour/src/rtl/radiobhb.prg b/src/rtl/radiobhb.prg similarity index 100% rename from harbour/src/rtl/radiobhb.prg rename to src/rtl/radiobhb.prg diff --git a/harbour/src/rtl/radiobtn.prg b/src/rtl/radiobtn.prg similarity index 100% rename from harbour/src/rtl/radiobtn.prg rename to src/rtl/radiobtn.prg diff --git a/harbour/src/rtl/radiogrp.prg b/src/rtl/radiogrp.prg similarity index 100% rename from harbour/src/rtl/radiogrp.prg rename to src/rtl/radiogrp.prg diff --git a/harbour/src/rtl/rat.c b/src/rtl/rat.c similarity index 100% rename from harbour/src/rtl/rat.c rename to src/rtl/rat.c diff --git a/harbour/src/rtl/readkey.prg b/src/rtl/readkey.prg similarity index 100% rename from harbour/src/rtl/readkey.prg rename to src/rtl/readkey.prg diff --git a/harbour/src/rtl/readvar.prg b/src/rtl/readvar.prg similarity index 100% rename from harbour/src/rtl/readvar.prg rename to src/rtl/readvar.prg diff --git a/harbour/src/rtl/replic.c b/src/rtl/replic.c similarity index 100% rename from harbour/src/rtl/replic.c rename to src/rtl/replic.c diff --git a/harbour/src/rtl/right.c b/src/rtl/right.c similarity index 100% rename from harbour/src/rtl/right.c rename to src/rtl/right.c diff --git a/harbour/src/rtl/round.c b/src/rtl/round.c similarity index 100% rename from harbour/src/rtl/round.c rename to src/rtl/round.c diff --git a/harbour/src/rtl/run.c b/src/rtl/run.c similarity index 100% rename from harbour/src/rtl/run.c rename to src/rtl/run.c diff --git a/harbour/src/rtl/samples.c b/src/rtl/samples.c similarity index 100% rename from harbour/src/rtl/samples.c rename to src/rtl/samples.c diff --git a/harbour/src/rtl/savebuff.prg b/src/rtl/savebuff.prg similarity index 100% rename from harbour/src/rtl/savebuff.prg rename to src/rtl/savebuff.prg diff --git a/harbour/src/rtl/saverest.c b/src/rtl/saverest.c similarity index 100% rename from harbour/src/rtl/saverest.c rename to src/rtl/saverest.c diff --git a/harbour/src/rtl/scroll.c b/src/rtl/scroll.c similarity index 100% rename from harbour/src/rtl/scroll.c rename to src/rtl/scroll.c diff --git a/harbour/src/rtl/scrollbr.prg b/src/rtl/scrollbr.prg similarity index 100% rename from harbour/src/rtl/scrollbr.prg rename to src/rtl/scrollbr.prg diff --git a/harbour/src/rtl/scrrow.c b/src/rtl/scrrow.c similarity index 100% rename from harbour/src/rtl/scrrow.c rename to src/rtl/scrrow.c diff --git a/harbour/src/rtl/seconds.c b/src/rtl/seconds.c similarity index 100% rename from harbour/src/rtl/seconds.c rename to src/rtl/seconds.c diff --git a/harbour/src/rtl/setcolor.c b/src/rtl/setcolor.c similarity index 100% rename from harbour/src/rtl/setcolor.c rename to src/rtl/setcolor.c diff --git a/harbour/src/rtl/setcurs.c b/src/rtl/setcurs.c similarity index 100% rename from harbour/src/rtl/setcurs.c rename to src/rtl/setcurs.c diff --git a/harbour/src/rtl/setfunc.prg b/src/rtl/setfunc.prg similarity index 100% rename from harbour/src/rtl/setfunc.prg rename to src/rtl/setfunc.prg diff --git a/harbour/src/rtl/setkey.c b/src/rtl/setkey.c similarity index 100% rename from harbour/src/rtl/setkey.c rename to src/rtl/setkey.c diff --git a/harbour/src/rtl/setpos.c b/src/rtl/setpos.c similarity index 100% rename from harbour/src/rtl/setpos.c rename to src/rtl/setpos.c diff --git a/harbour/src/rtl/setposbs.c b/src/rtl/setposbs.c similarity index 100% rename from harbour/src/rtl/setposbs.c rename to src/rtl/setposbs.c diff --git a/harbour/src/rtl/setta.prg b/src/rtl/setta.prg similarity index 100% rename from harbour/src/rtl/setta.prg rename to src/rtl/setta.prg diff --git a/harbour/src/rtl/sha1.c b/src/rtl/sha1.c similarity index 100% rename from harbour/src/rtl/sha1.c rename to src/rtl/sha1.c diff --git a/harbour/src/rtl/sha1.h b/src/rtl/sha1.h similarity index 100% rename from harbour/src/rtl/sha1.h rename to src/rtl/sha1.h diff --git a/harbour/src/rtl/sha1hmac.c b/src/rtl/sha1hmac.c similarity index 100% rename from harbour/src/rtl/sha1hmac.c rename to src/rtl/sha1hmac.c diff --git a/harbour/src/rtl/sha1hmac.h b/src/rtl/sha1hmac.h similarity index 100% rename from harbour/src/rtl/sha1hmac.h rename to src/rtl/sha1hmac.h diff --git a/harbour/src/rtl/sha2.c b/src/rtl/sha2.c similarity index 100% rename from harbour/src/rtl/sha2.c rename to src/rtl/sha2.c diff --git a/harbour/src/rtl/sha2.h b/src/rtl/sha2.h similarity index 100% rename from harbour/src/rtl/sha2.h rename to src/rtl/sha2.h diff --git a/harbour/src/rtl/sha2hmac.c b/src/rtl/sha2hmac.c similarity index 100% rename from harbour/src/rtl/sha2hmac.c rename to src/rtl/sha2hmac.c diff --git a/harbour/src/rtl/sha2hmac.h b/src/rtl/sha2hmac.h similarity index 100% rename from harbour/src/rtl/sha2hmac.h rename to src/rtl/sha2hmac.h diff --git a/harbour/src/rtl/shadow.c b/src/rtl/shadow.c similarity index 100% rename from harbour/src/rtl/shadow.c rename to src/rtl/shadow.c diff --git a/harbour/src/rtl/shadowu.c b/src/rtl/shadowu.c similarity index 100% rename from harbour/src/rtl/shadowu.c rename to src/rtl/shadowu.c diff --git a/harbour/src/rtl/soundex.c b/src/rtl/soundex.c similarity index 100% rename from harbour/src/rtl/soundex.c rename to src/rtl/soundex.c diff --git a/harbour/src/rtl/space.c b/src/rtl/space.c similarity index 100% rename from harbour/src/rtl/space.c rename to src/rtl/space.c diff --git a/harbour/src/rtl/spfiles.c b/src/rtl/spfiles.c similarity index 100% rename from harbour/src/rtl/spfiles.c rename to src/rtl/spfiles.c diff --git a/harbour/src/rtl/str.c b/src/rtl/str.c similarity index 100% rename from harbour/src/rtl/str.c rename to src/rtl/str.c diff --git a/harbour/src/rtl/strc.c b/src/rtl/strc.c similarity index 100% rename from harbour/src/rtl/strc.c rename to src/rtl/strc.c diff --git a/harbour/src/rtl/strcase.c b/src/rtl/strcase.c similarity index 100% rename from harbour/src/rtl/strcase.c rename to src/rtl/strcase.c diff --git a/harbour/src/rtl/strclear.c b/src/rtl/strclear.c similarity index 100% rename from harbour/src/rtl/strclear.c rename to src/rtl/strclear.c diff --git a/harbour/src/rtl/strmatch.c b/src/rtl/strmatch.c similarity index 100% rename from harbour/src/rtl/strmatch.c rename to src/rtl/strmatch.c diff --git a/harbour/src/rtl/strrepl.c b/src/rtl/strrepl.c similarity index 100% rename from harbour/src/rtl/strrepl.c rename to src/rtl/strrepl.c diff --git a/harbour/src/rtl/strtoexp.c b/src/rtl/strtoexp.c similarity index 100% rename from harbour/src/rtl/strtoexp.c rename to src/rtl/strtoexp.c diff --git a/harbour/src/rtl/strtran.c b/src/rtl/strtran.c similarity index 100% rename from harbour/src/rtl/strtran.c rename to src/rtl/strtran.c diff --git a/harbour/src/rtl/strxor.c b/src/rtl/strxor.c similarity index 100% rename from harbour/src/rtl/strxor.c rename to src/rtl/strxor.c diff --git a/harbour/src/rtl/strzero.c b/src/rtl/strzero.c similarity index 100% rename from harbour/src/rtl/strzero.c rename to src/rtl/strzero.c diff --git a/harbour/src/rtl/stuff.c b/src/rtl/stuff.c similarity index 100% rename from harbour/src/rtl/stuff.c rename to src/rtl/stuff.c diff --git a/harbour/src/rtl/substr.c b/src/rtl/substr.c similarity index 100% rename from harbour/src/rtl/substr.c rename to src/rtl/substr.c diff --git a/harbour/src/rtl/tbcolumn.prg b/src/rtl/tbcolumn.prg similarity index 100% rename from harbour/src/rtl/tbcolumn.prg rename to src/rtl/tbcolumn.prg diff --git a/harbour/src/rtl/tbrowse.prg b/src/rtl/tbrowse.prg similarity index 100% rename from harbour/src/rtl/tbrowse.prg rename to src/rtl/tbrowse.prg diff --git a/harbour/src/rtl/tbrowsys.prg b/src/rtl/tbrowsys.prg similarity index 100% rename from harbour/src/rtl/tbrowsys.prg rename to src/rtl/tbrowsys.prg diff --git a/harbour/src/rtl/tclass.prg b/src/rtl/tclass.prg similarity index 100% rename from harbour/src/rtl/tclass.prg rename to src/rtl/tclass.prg diff --git a/harbour/src/rtl/teditor.prg b/src/rtl/teditor.prg similarity index 100% rename from harbour/src/rtl/teditor.prg rename to src/rtl/teditor.prg diff --git a/harbour/src/rtl/text.prg b/src/rtl/text.prg similarity index 100% rename from harbour/src/rtl/text.prg rename to src/rtl/text.prg diff --git a/harbour/src/rtl/tget.prg b/src/rtl/tget.prg similarity index 100% rename from harbour/src/rtl/tget.prg rename to src/rtl/tget.prg diff --git a/harbour/src/rtl/tgethb.prg b/src/rtl/tgethb.prg similarity index 100% rename from harbour/src/rtl/tgethb.prg rename to src/rtl/tgethb.prg diff --git a/harbour/src/rtl/tgetint.prg b/src/rtl/tgetint.prg similarity index 100% rename from harbour/src/rtl/tgetint.prg rename to src/rtl/tgetint.prg diff --git a/harbour/src/rtl/tgetlist.prg b/src/rtl/tgetlist.prg similarity index 100% rename from harbour/src/rtl/tgetlist.prg rename to src/rtl/tgetlist.prg diff --git a/harbour/src/rtl/tlabel.prg b/src/rtl/tlabel.prg similarity index 100% rename from harbour/src/rtl/tlabel.prg rename to src/rtl/tlabel.prg diff --git a/harbour/src/rtl/tmenuitm.prg b/src/rtl/tmenuitm.prg similarity index 100% rename from harbour/src/rtl/tmenuitm.prg rename to src/rtl/tmenuitm.prg diff --git a/harbour/src/rtl/tmenusys.prg b/src/rtl/tmenusys.prg similarity index 100% rename from harbour/src/rtl/tmenusys.prg rename to src/rtl/tmenusys.prg diff --git a/harbour/src/rtl/tobject.prg b/src/rtl/tobject.prg similarity index 100% rename from harbour/src/rtl/tobject.prg rename to src/rtl/tobject.prg diff --git a/harbour/src/rtl/tone.c b/src/rtl/tone.c similarity index 100% rename from harbour/src/rtl/tone.c rename to src/rtl/tone.c diff --git a/harbour/src/rtl/tpersist.prg b/src/rtl/tpersist.prg similarity index 100% rename from harbour/src/rtl/tpersist.prg rename to src/rtl/tpersist.prg diff --git a/harbour/src/rtl/tpopup.prg b/src/rtl/tpopup.prg similarity index 100% rename from harbour/src/rtl/tpopup.prg rename to src/rtl/tpopup.prg diff --git a/harbour/src/rtl/tpopuphb.prg b/src/rtl/tpopuphb.prg similarity index 100% rename from harbour/src/rtl/tpopuphb.prg rename to src/rtl/tpopuphb.prg diff --git a/harbour/src/rtl/trace.c b/src/rtl/trace.c similarity index 100% rename from harbour/src/rtl/trace.c rename to src/rtl/trace.c diff --git a/harbour/src/rtl/transfrm.c b/src/rtl/transfrm.c similarity index 100% rename from harbour/src/rtl/transfrm.c rename to src/rtl/transfrm.c diff --git a/harbour/src/rtl/treport.prg b/src/rtl/treport.prg similarity index 100% rename from harbour/src/rtl/treport.prg rename to src/rtl/treport.prg diff --git a/harbour/src/rtl/trim.c b/src/rtl/trim.c similarity index 100% rename from harbour/src/rtl/trim.c rename to src/rtl/trim.c diff --git a/harbour/src/rtl/tscalar.prg b/src/rtl/tscalar.prg similarity index 100% rename from harbour/src/rtl/tscalar.prg rename to src/rtl/tscalar.prg diff --git a/harbour/src/rtl/tscalara.c b/src/rtl/tscalara.c similarity index 100% rename from harbour/src/rtl/tscalara.c rename to src/rtl/tscalara.c diff --git a/harbour/src/rtl/tscalarb.c b/src/rtl/tscalarb.c similarity index 100% rename from harbour/src/rtl/tscalarb.c rename to src/rtl/tscalarb.c diff --git a/harbour/src/rtl/tscalarc.c b/src/rtl/tscalarc.c similarity index 100% rename from harbour/src/rtl/tscalarc.c rename to src/rtl/tscalarc.c diff --git a/harbour/src/rtl/tscalard.c b/src/rtl/tscalard.c similarity index 100% rename from harbour/src/rtl/tscalard.c rename to src/rtl/tscalard.c diff --git a/harbour/src/rtl/tscalarh.c b/src/rtl/tscalarh.c similarity index 100% rename from harbour/src/rtl/tscalarh.c rename to src/rtl/tscalarh.c diff --git a/harbour/src/rtl/tscalarl.c b/src/rtl/tscalarl.c similarity index 100% rename from harbour/src/rtl/tscalarl.c rename to src/rtl/tscalarl.c diff --git a/harbour/src/rtl/tscalarn.c b/src/rtl/tscalarn.c similarity index 100% rename from harbour/src/rtl/tscalarn.c rename to src/rtl/tscalarn.c diff --git a/harbour/src/rtl/tscalarp.c b/src/rtl/tscalarp.c similarity index 100% rename from harbour/src/rtl/tscalarp.c rename to src/rtl/tscalarp.c diff --git a/harbour/src/rtl/tscalars.c b/src/rtl/tscalars.c similarity index 100% rename from harbour/src/rtl/tscalars.c rename to src/rtl/tscalars.c diff --git a/harbour/src/rtl/tscalart.c b/src/rtl/tscalart.c similarity index 100% rename from harbour/src/rtl/tscalart.c rename to src/rtl/tscalart.c diff --git a/harbour/src/rtl/tscalaru.c b/src/rtl/tscalaru.c similarity index 100% rename from harbour/src/rtl/tscalaru.c rename to src/rtl/tscalaru.c diff --git a/harbour/src/rtl/tsymbol.prg b/src/rtl/tsymbol.prg similarity index 100% rename from harbour/src/rtl/tsymbol.prg rename to src/rtl/tsymbol.prg diff --git a/harbour/src/rtl/ttextlin.prg b/src/rtl/ttextlin.prg similarity index 100% rename from harbour/src/rtl/ttextlin.prg rename to src/rtl/ttextlin.prg diff --git a/harbour/src/rtl/ttopbar.prg b/src/rtl/ttopbar.prg similarity index 100% rename from harbour/src/rtl/ttopbar.prg rename to src/rtl/ttopbar.prg diff --git a/harbour/src/rtl/type.c b/src/rtl/type.c similarity index 100% rename from harbour/src/rtl/type.c rename to src/rtl/type.c diff --git a/harbour/src/rtl/typefile.prg b/src/rtl/typefile.prg similarity index 100% rename from harbour/src/rtl/typefile.prg rename to src/rtl/typefile.prg diff --git a/harbour/src/rtl/val.c b/src/rtl/val.c similarity index 100% rename from harbour/src/rtl/val.c rename to src/rtl/val.c diff --git a/harbour/src/rtl/valtoexp.prg b/src/rtl/valtoexp.prg similarity index 100% rename from harbour/src/rtl/valtoexp.prg rename to src/rtl/valtoexp.prg diff --git a/harbour/src/rtl/valtostr.c b/src/rtl/valtostr.c similarity index 100% rename from harbour/src/rtl/valtostr.c rename to src/rtl/valtostr.c diff --git a/harbour/src/rtl/valtype.c b/src/rtl/valtype.c similarity index 100% rename from harbour/src/rtl/valtype.c rename to src/rtl/valtype.c diff --git a/harbour/src/rtl/version.c b/src/rtl/version.c similarity index 100% rename from harbour/src/rtl/version.c rename to src/rtl/version.c diff --git a/harbour/src/rtl/wait.prg b/src/rtl/wait.prg similarity index 100% rename from harbour/src/rtl/wait.prg rename to src/rtl/wait.prg diff --git a/harbour/src/rtl/word.c b/src/rtl/word.c similarity index 100% rename from harbour/src/rtl/word.c rename to src/rtl/word.c diff --git a/harbour/src/rtl/xhelp.c b/src/rtl/xhelp.c similarity index 100% rename from harbour/src/rtl/xhelp.c rename to src/rtl/xhelp.c diff --git a/harbour/src/rtl/xsavescr.c b/src/rtl/xsavescr.c similarity index 100% rename from harbour/src/rtl/xsavescr.c rename to src/rtl/xsavescr.c diff --git a/harbour/src/vm/Makefile b/src/vm/Makefile similarity index 100% rename from harbour/src/vm/Makefile rename to src/vm/Makefile diff --git a/harbour/src/vm/arrays.c b/src/vm/arrays.c similarity index 100% rename from harbour/src/vm/arrays.c rename to src/vm/arrays.c diff --git a/harbour/src/vm/arrayshb.c b/src/vm/arrayshb.c similarity index 100% rename from harbour/src/vm/arrayshb.c rename to src/vm/arrayshb.c diff --git a/harbour/src/vm/asort.c b/src/vm/asort.c similarity index 100% rename from harbour/src/vm/asort.c rename to src/vm/asort.c diff --git a/harbour/src/vm/break.c b/src/vm/break.c similarity index 100% rename from harbour/src/vm/break.c rename to src/vm/break.c diff --git a/harbour/src/vm/classes.c b/src/vm/classes.c similarity index 100% rename from harbour/src/vm/classes.c rename to src/vm/classes.c diff --git a/harbour/src/vm/cmdarg.c b/src/vm/cmdarg.c similarity index 100% rename from harbour/src/vm/cmdarg.c rename to src/vm/cmdarg.c diff --git a/harbour/src/vm/codebloc.c b/src/vm/codebloc.c similarity index 100% rename from harbour/src/vm/codebloc.c rename to src/vm/codebloc.c diff --git a/harbour/src/vm/debug.c b/src/vm/debug.c similarity index 100% rename from harbour/src/vm/debug.c rename to src/vm/debug.c diff --git a/harbour/src/vm/dlmalloc.c b/src/vm/dlmalloc.c similarity index 100% rename from harbour/src/vm/dlmalloc.c rename to src/vm/dlmalloc.c diff --git a/harbour/src/vm/dynlibhb.c b/src/vm/dynlibhb.c similarity index 100% rename from harbour/src/vm/dynlibhb.c rename to src/vm/dynlibhb.c diff --git a/harbour/src/vm/dynsym.c b/src/vm/dynsym.c similarity index 100% rename from harbour/src/vm/dynsym.c rename to src/vm/dynsym.c diff --git a/harbour/src/vm/estack.c b/src/vm/estack.c similarity index 100% rename from harbour/src/vm/estack.c rename to src/vm/estack.c diff --git a/harbour/src/vm/eval.c b/src/vm/eval.c similarity index 100% rename from harbour/src/vm/eval.c rename to src/vm/eval.c diff --git a/harbour/src/vm/evalhb.c b/src/vm/evalhb.c similarity index 100% rename from harbour/src/vm/evalhb.c rename to src/vm/evalhb.c diff --git a/harbour/src/vm/extend.c b/src/vm/extend.c similarity index 100% rename from harbour/src/vm/extend.c rename to src/vm/extend.c diff --git a/harbour/src/vm/extrap.c b/src/vm/extrap.c similarity index 100% rename from harbour/src/vm/extrap.c rename to src/vm/extrap.c diff --git a/harbour/src/vm/fm.c b/src/vm/fm.c similarity index 100% rename from harbour/src/vm/fm.c rename to src/vm/fm.c diff --git a/harbour/src/vm/garbage.c b/src/vm/garbage.c similarity index 100% rename from harbour/src/vm/garbage.c rename to src/vm/garbage.c diff --git a/harbour/src/vm/harbinit.prg b/src/vm/harbinit.prg similarity index 100% rename from harbour/src/vm/harbinit.prg rename to src/vm/harbinit.prg diff --git a/harbour/src/vm/hashes.c b/src/vm/hashes.c similarity index 100% rename from harbour/src/vm/hashes.c rename to src/vm/hashes.c diff --git a/harbour/src/vm/hashfunc.c b/src/vm/hashfunc.c similarity index 100% rename from harbour/src/vm/hashfunc.c rename to src/vm/hashfunc.c diff --git a/harbour/src/vm/hvm.c b/src/vm/hvm.c similarity index 100% rename from harbour/src/vm/hvm.c rename to src/vm/hvm.c diff --git a/harbour/src/vm/hvmall.c b/src/vm/hvmall.c similarity index 100% rename from harbour/src/vm/hvmall.c rename to src/vm/hvmall.c diff --git a/harbour/src/vm/initexit.c b/src/vm/initexit.c similarity index 100% rename from harbour/src/vm/initexit.c rename to src/vm/initexit.c diff --git a/harbour/src/vm/initsymb.c b/src/vm/initsymb.c similarity index 100% rename from harbour/src/vm/initsymb.c rename to src/vm/initsymb.c diff --git a/harbour/src/vm/itemapi.c b/src/vm/itemapi.c similarity index 100% rename from harbour/src/vm/itemapi.c rename to src/vm/itemapi.c diff --git a/harbour/src/vm/macro.c b/src/vm/macro.c similarity index 100% rename from harbour/src/vm/macro.c rename to src/vm/macro.c diff --git a/harbour/src/vm/main.c b/src/vm/main.c similarity index 100% rename from harbour/src/vm/main.c rename to src/vm/main.c diff --git a/harbour/src/vm/maindllh.c b/src/vm/maindllh.c similarity index 100% rename from harbour/src/vm/maindllh.c rename to src/vm/maindllh.c diff --git a/harbour/src/vm/maindllh/Makefile b/src/vm/maindllh/Makefile similarity index 100% rename from harbour/src/vm/maindllh/Makefile rename to src/vm/maindllh/Makefile diff --git a/harbour/src/vm/maindllp/Makefile b/src/vm/maindllp/Makefile similarity index 100% rename from harbour/src/vm/maindllp/Makefile rename to src/vm/maindllp/Makefile diff --git a/harbour/src/vm/maindllp/dllext.c b/src/vm/maindllp/dllext.c similarity index 100% rename from harbour/src/vm/maindllp/dllext.c rename to src/vm/maindllp/dllext.c diff --git a/harbour/src/vm/maindllp/dllpcode.c b/src/vm/maindllp/dllpcode.c similarity index 100% rename from harbour/src/vm/maindllp/dllpcode.c rename to src/vm/maindllp/dllpcode.c diff --git a/harbour/src/vm/mainstd.c b/src/vm/mainstd.c similarity index 100% rename from harbour/src/vm/mainstd.c rename to src/vm/mainstd.c diff --git a/harbour/src/vm/mainstd/Makefile b/src/vm/mainstd/Makefile similarity index 100% rename from harbour/src/vm/mainstd/Makefile rename to src/vm/mainstd/Makefile diff --git a/harbour/src/vm/mainwin.c b/src/vm/mainwin.c similarity index 100% rename from harbour/src/vm/mainwin.c rename to src/vm/mainwin.c diff --git a/harbour/src/vm/mainwin/Makefile b/src/vm/mainwin/Makefile similarity index 100% rename from harbour/src/vm/mainwin/Makefile rename to src/vm/mainwin/Makefile diff --git a/harbour/src/vm/memvars.c b/src/vm/memvars.c similarity index 100% rename from harbour/src/vm/memvars.c rename to src/vm/memvars.c diff --git a/harbour/src/vm/memvclip.c b/src/vm/memvclip.c similarity index 100% rename from harbour/src/vm/memvclip.c rename to src/vm/memvclip.c diff --git a/harbour/src/vm/pbyref.c b/src/vm/pbyref.c similarity index 100% rename from harbour/src/vm/pbyref.c rename to src/vm/pbyref.c diff --git a/harbour/src/vm/pcount.c b/src/vm/pcount.c similarity index 100% rename from harbour/src/vm/pcount.c rename to src/vm/pcount.c diff --git a/harbour/src/vm/proc.c b/src/vm/proc.c similarity index 100% rename from harbour/src/vm/proc.c rename to src/vm/proc.c diff --git a/harbour/src/vm/procaddr.c b/src/vm/procaddr.c similarity index 100% rename from harbour/src/vm/procaddr.c rename to src/vm/procaddr.c diff --git a/harbour/src/vm/pvalue.c b/src/vm/pvalue.c similarity index 100% rename from harbour/src/vm/pvalue.c rename to src/vm/pvalue.c diff --git a/harbour/src/vm/pvaluehb.c b/src/vm/pvaluehb.c similarity index 100% rename from harbour/src/vm/pvaluehb.c rename to src/vm/pvaluehb.c diff --git a/harbour/src/vm/runner.c b/src/vm/runner.c similarity index 100% rename from harbour/src/vm/runner.c rename to src/vm/runner.c diff --git a/harbour/src/vm/set.c b/src/vm/set.c similarity index 100% rename from harbour/src/vm/set.c rename to src/vm/set.c diff --git a/harbour/src/vm/strapi.c b/src/vm/strapi.c similarity index 100% rename from harbour/src/vm/strapi.c rename to src/vm/strapi.c diff --git a/harbour/src/vm/task.c b/src/vm/task.c similarity index 100% rename from harbour/src/vm/task.c rename to src/vm/task.c diff --git a/harbour/src/vm/thread.c b/src/vm/thread.c similarity index 100% rename from harbour/src/vm/thread.c rename to src/vm/thread.c diff --git a/harbour/src/vm/vm.c b/src/vm/vm.c similarity index 100% rename from harbour/src/vm/vm.c rename to src/vm/vm.c diff --git a/harbour/src/vm/vmmt/Makefile b/src/vm/vmmt/Makefile similarity index 100% rename from harbour/src/vm/vmmt/Makefile rename to src/vm/vmmt/Makefile diff --git a/harbour/tests/achoice.prg b/tests/achoice.prg similarity index 100% rename from harbour/tests/achoice.prg rename to tests/achoice.prg diff --git a/harbour/tests/achoice2.prg b/tests/achoice2.prg similarity index 100% rename from harbour/tests/achoice2.prg rename to tests/achoice2.prg diff --git a/harbour/tests/adir.prg b/tests/adir.prg similarity index 100% rename from harbour/tests/adir.prg rename to tests/adir.prg diff --git a/harbour/tests/ains.prg b/tests/ains.prg similarity index 100% rename from harbour/tests/ains.prg rename to tests/ains.prg diff --git a/harbour/tests/alias.prg b/tests/alias.prg similarity index 100% rename from harbour/tests/alias.prg rename to tests/alias.prg diff --git a/harbour/tests/aliaslck.prg b/tests/aliaslck.prg similarity index 100% rename from harbour/tests/aliaslck.prg rename to tests/aliaslck.prg diff --git a/harbour/tests/aliasrt.prg b/tests/aliasrt.prg similarity index 100% rename from harbour/tests/aliasrt.prg rename to tests/aliasrt.prg diff --git a/harbour/tests/altd.prg b/tests/altd.prg similarity index 100% rename from harbour/tests/altd.prg rename to tests/altd.prg diff --git a/harbour/tests/and_or.prg b/tests/and_or.prg similarity index 100% rename from harbour/tests/and_or.prg rename to tests/and_or.prg diff --git a/harbour/tests/array.prg b/tests/array.prg similarity index 100% rename from harbour/tests/array.prg rename to tests/array.prg diff --git a/harbour/tests/array16.prg b/tests/array16.prg similarity index 100% rename from harbour/tests/array16.prg rename to tests/array16.prg diff --git a/harbour/tests/arrayidx.prg b/tests/arrayidx.prg similarity index 100% rename from harbour/tests/arrayidx.prg rename to tests/arrayidx.prg diff --git a/harbour/tests/arrays.prg b/tests/arrays.prg similarity index 100% rename from harbour/tests/arrays.prg rename to tests/arrays.prg diff --git a/harbour/tests/arreval.prg b/tests/arreval.prg similarity index 100% rename from harbour/tests/arreval.prg rename to tests/arreval.prg diff --git a/harbour/tests/arrindex.prg b/tests/arrindex.prg similarity index 100% rename from harbour/tests/arrindex.prg rename to tests/arrindex.prg diff --git a/harbour/tests/asort.prg b/tests/asort.prg similarity index 100% rename from harbour/tests/asort.prg rename to tests/asort.prg diff --git a/harbour/tests/base64.prg b/tests/base64.prg similarity index 100% rename from harbour/tests/base64.prg rename to tests/base64.prg diff --git a/harbour/tests/begin.prg b/tests/begin.prg similarity index 100% rename from harbour/tests/begin.prg rename to tests/begin.prg diff --git a/harbour/tests/big5_gen.prg b/tests/big5_gen.prg similarity index 100% rename from harbour/tests/big5_gen.prg rename to tests/big5_gen.prg diff --git a/harbour/tests/bldtest/Makefile b/tests/bldtest/Makefile similarity index 100% rename from harbour/tests/bldtest/Makefile rename to tests/bldtest/Makefile diff --git a/harbour/tests/bldtest/bldtest.c b/tests/bldtest/bldtest.c similarity index 100% rename from harbour/tests/bldtest/bldtest.c rename to tests/bldtest/bldtest.c diff --git a/harbour/tests/box.prg b/tests/box.prg similarity index 100% rename from harbour/tests/box.prg rename to tests/box.prg diff --git a/harbour/tests/box2.prg b/tests/box2.prg similarity index 100% rename from harbour/tests/box2.prg rename to tests/box2.prg diff --git a/harbour/tests/box3.prg b/tests/box3.prg similarity index 100% rename from harbour/tests/box3.prg rename to tests/box3.prg diff --git a/harbour/tests/browse.prg b/tests/browse.prg similarity index 100% rename from harbour/tests/browse.prg rename to tests/browse.prg diff --git a/harbour/tests/brwpos.prg b/tests/brwpos.prg similarity index 100% rename from harbour/tests/brwpos.prg rename to tests/brwpos.prg diff --git a/harbour/tests/byref.prg b/tests/byref.prg similarity index 100% rename from harbour/tests/byref.prg rename to tests/byref.prg diff --git a/harbour/tests/calling.prg b/tests/calling.prg similarity index 100% rename from harbour/tests/calling.prg rename to tests/calling.prg diff --git a/harbour/tests/cblock.prg b/tests/cblock.prg similarity index 100% rename from harbour/tests/cblock.prg rename to tests/cblock.prg diff --git a/harbour/tests/cdow.prg b/tests/cdow.prg similarity index 100% rename from harbour/tests/cdow.prg rename to tests/cdow.prg diff --git a/harbour/tests/cdx.prg b/tests/cdx.prg similarity index 100% rename from harbour/tests/cdx.prg rename to tests/cdx.prg diff --git a/harbour/tests/checkbox.prg b/tests/checkbox.prg similarity index 100% rename from harbour/tests/checkbox.prg rename to tests/checkbox.prg diff --git a/harbour/tests/clasinh.prg b/tests/clasinh.prg similarity index 100% rename from harbour/tests/clasinh.prg rename to tests/clasinh.prg diff --git a/harbour/tests/clasinit.prg b/tests/clasinit.prg similarity index 100% rename from harbour/tests/clasinit.prg rename to tests/clasinit.prg diff --git a/harbour/tests/clasname.prg b/tests/clasname.prg similarity index 100% rename from harbour/tests/clasname.prg rename to tests/clasname.prg diff --git a/harbour/tests/classch.prg b/tests/classch.prg similarity index 100% rename from harbour/tests/classch.prg rename to tests/classch.prg diff --git a/harbour/tests/classes.prg b/tests/classes.prg similarity index 100% rename from harbour/tests/classes.prg rename to tests/classes.prg diff --git a/harbour/tests/clipper.ch b/tests/clipper.ch similarity index 100% rename from harbour/tests/clipper.ch rename to tests/clipper.ch diff --git a/harbour/tests/cls.prg b/tests/cls.prg similarity index 100% rename from harbour/tests/cls.prg rename to tests/cls.prg diff --git a/harbour/tests/clsccast.prg b/tests/clsccast.prg similarity index 100% rename from harbour/tests/clsccast.prg rename to tests/clsccast.prg diff --git a/harbour/tests/clsdata.prg b/tests/clsdata.prg similarity index 100% rename from harbour/tests/clsdata.prg rename to tests/clsdata.prg diff --git a/harbour/tests/clsicast.prg b/tests/clsicast.prg similarity index 100% rename from harbour/tests/clsicast.prg rename to tests/clsicast.prg diff --git a/harbour/tests/clsnv.prg b/tests/clsnv.prg similarity index 100% rename from harbour/tests/clsnv.prg rename to tests/clsnv.prg diff --git a/harbour/tests/clsscast.prg b/tests/clsscast.prg similarity index 100% rename from harbour/tests/clsscast.prg rename to tests/clsscast.prg diff --git a/harbour/tests/clsscope.prg b/tests/clsscope.prg similarity index 100% rename from harbour/tests/clsscope.prg rename to tests/clsscope.prg diff --git a/harbour/tests/cmdarg.c b/tests/cmdarg.c similarity index 100% rename from harbour/tests/cmdarg.c rename to tests/cmdarg.c diff --git a/harbour/tests/cmphello.prg b/tests/cmphello.prg similarity index 100% rename from harbour/tests/cmphello.prg rename to tests/cmphello.prg diff --git a/harbour/tests/codebl.prg b/tests/codebl.prg similarity index 100% rename from harbour/tests/codebl.prg rename to tests/codebl.prg diff --git a/harbour/tests/codebloc.prg b/tests/codebloc.prg similarity index 100% rename from harbour/tests/codebloc.prg rename to tests/codebloc.prg diff --git a/harbour/tests/color.prg b/tests/color.prg similarity index 100% rename from harbour/tests/color.prg rename to tests/color.prg diff --git a/harbour/tests/com.prg b/tests/com.prg similarity index 100% rename from harbour/tests/com.prg rename to tests/com.prg diff --git a/harbour/tests/comments.prg b/tests/comments.prg similarity index 100% rename from harbour/tests/comments.prg rename to tests/comments.prg diff --git a/harbour/tests/commouse.prg b/tests/commouse.prg similarity index 100% rename from harbour/tests/commouse.prg rename to tests/commouse.prg diff --git a/harbour/tests/cpinfo.prg b/tests/cpinfo.prg similarity index 100% rename from harbour/tests/cpinfo.prg rename to tests/cpinfo.prg diff --git a/harbour/tests/curdirt.prg b/tests/curdirt.prg similarity index 100% rename from harbour/tests/curdirt.prg rename to tests/curdirt.prg diff --git a/harbour/tests/cursor.prg b/tests/cursor.prg similarity index 100% rename from harbour/tests/cursor.prg rename to tests/cursor.prg diff --git a/harbour/tests/dates.prg b/tests/dates.prg similarity index 100% rename from harbour/tests/dates.prg rename to tests/dates.prg diff --git a/harbour/tests/dates2.prg b/tests/dates2.prg similarity index 100% rename from harbour/tests/dates2.prg rename to tests/dates2.prg diff --git a/harbour/tests/dates3.prg b/tests/dates3.prg similarity index 100% rename from harbour/tests/dates3.prg rename to tests/dates3.prg diff --git a/harbour/tests/datetime.prg b/tests/datetime.prg similarity index 100% rename from harbour/tests/datetime.prg rename to tests/datetime.prg diff --git a/harbour/tests/db_brows.prg b/tests/db_brows.prg similarity index 100% rename from harbour/tests/db_brows.prg rename to tests/db_brows.prg diff --git a/harbour/tests/dbeval.prg b/tests/dbeval.prg similarity index 100% rename from harbour/tests/dbeval.prg rename to tests/dbeval.prg diff --git a/harbour/tests/dbf.prg b/tests/dbf.prg similarity index 100% rename from harbour/tests/dbf.prg rename to tests/dbf.prg diff --git a/harbour/tests/dbgcls.prg b/tests/dbgcls.prg similarity index 100% rename from harbour/tests/dbgcls.prg rename to tests/dbgcls.prg diff --git a/harbour/tests/dbi.prg b/tests/dbi.prg similarity index 100% rename from harbour/tests/dbi.prg rename to tests/dbi.prg diff --git a/harbour/tests/ddate.prg b/tests/ddate.prg similarity index 100% rename from harbour/tests/ddate.prg rename to tests/ddate.prg diff --git a/harbour/tests/debug.prg b/tests/debug.prg similarity index 100% rename from harbour/tests/debug.prg rename to tests/debug.prg diff --git a/harbour/tests/declare.prg b/tests/declare.prg similarity index 100% rename from harbour/tests/declare.prg rename to tests/declare.prg diff --git a/harbour/tests/define.prg b/tests/define.prg similarity index 100% rename from harbour/tests/define.prg rename to tests/define.prg diff --git a/harbour/tests/delim.prg b/tests/delim.prg similarity index 100% rename from harbour/tests/delim.prg rename to tests/delim.prg diff --git a/harbour/tests/destruct.prg b/tests/destruct.prg similarity index 100% rename from harbour/tests/destruct.prg rename to tests/destruct.prg diff --git a/harbour/tests/dev.prg b/tests/dev.prg similarity index 100% rename from harbour/tests/dev.prg rename to tests/dev.prg diff --git a/harbour/tests/directry.prg b/tests/directry.prg similarity index 100% rename from harbour/tests/directry.prg rename to tests/directry.prg diff --git a/harbour/tests/diskspac.prg b/tests/diskspac.prg similarity index 100% rename from harbour/tests/diskspac.prg rename to tests/diskspac.prg diff --git a/harbour/tests/disp.prg b/tests/disp.prg similarity index 100% rename from harbour/tests/disp.prg rename to tests/disp.prg diff --git a/harbour/tests/docase.prg b/tests/docase.prg similarity index 100% rename from harbour/tests/docase.prg rename to tests/docase.prg diff --git a/harbour/tests/dupvars.prg b/tests/dupvars.prg similarity index 100% rename from harbour/tests/dupvars.prg rename to tests/dupvars.prg diff --git a/harbour/tests/dyn.c b/tests/dyn.c similarity index 100% rename from harbour/tests/dyn.c rename to tests/dyn.c diff --git a/harbour/tests/dyn.prg b/tests/dyn.prg similarity index 100% rename from harbour/tests/dyn.prg rename to tests/dyn.prg diff --git a/harbour/tests/dynobj.prg b/tests/dynobj.prg similarity index 100% rename from harbour/tests/dynobj.prg rename to tests/dynobj.prg diff --git a/harbour/tests/dynsym.prg b/tests/dynsym.prg similarity index 100% rename from harbour/tests/dynsym.prg rename to tests/dynsym.prg diff --git a/harbour/tests/dynwin.prg b/tests/dynwin.prg similarity index 100% rename from harbour/tests/dynwin.prg rename to tests/dynwin.prg diff --git a/harbour/tests/errsys.prg b/tests/errsys.prg similarity index 100% rename from harbour/tests/errsys.prg rename to tests/errsys.prg diff --git a/harbour/tests/exit.prg b/tests/exit.prg similarity index 100% rename from harbour/tests/exit.prg rename to tests/exit.prg diff --git a/harbour/tests/extend1.hbp b/tests/extend1.hbp similarity index 100% rename from harbour/tests/extend1.hbp rename to tests/extend1.hbp diff --git a/harbour/tests/extend1.prg b/tests/extend1.prg similarity index 100% rename from harbour/tests/extend1.prg rename to tests/extend1.prg diff --git a/harbour/tests/extend2.c b/tests/extend2.c similarity index 100% rename from harbour/tests/extend2.c rename to tests/extend2.c diff --git a/harbour/tests/fib.prg b/tests/fib.prg similarity index 100% rename from harbour/tests/fib.prg rename to tests/fib.prg diff --git a/harbour/tests/fileio.prg b/tests/fileio.prg similarity index 100% rename from harbour/tests/fileio.prg rename to tests/fileio.prg diff --git a/harbour/tests/fileio2.prg b/tests/fileio2.prg similarity index 100% rename from harbour/tests/fileio2.prg rename to tests/fileio2.prg diff --git a/harbour/tests/files.prg b/tests/files.prg similarity index 100% rename from harbour/tests/files.prg rename to tests/files.prg diff --git a/harbour/tests/fixcase.hb b/tests/fixcase.hb similarity index 100% rename from harbour/tests/fixcase.hb rename to tests/fixcase.hb diff --git a/harbour/tests/flink.prg b/tests/flink.prg similarity index 100% rename from harbour/tests/flink.prg rename to tests/flink.prg diff --git a/harbour/tests/for.prg b/tests/for.prg similarity index 100% rename from harbour/tests/for.prg rename to tests/for.prg diff --git a/harbour/tests/for2.prg b/tests/for2.prg similarity index 100% rename from harbour/tests/for2.prg rename to tests/for2.prg diff --git a/harbour/tests/foreach.prg b/tests/foreach.prg similarity index 100% rename from harbour/tests/foreach.prg rename to tests/foreach.prg diff --git a/harbour/tests/foreach2.prg b/tests/foreach2.prg similarity index 100% rename from harbour/tests/foreach2.prg rename to tests/foreach2.prg diff --git a/harbour/tests/fornext.prg b/tests/fornext.prg similarity index 100% rename from harbour/tests/fornext.prg rename to tests/fornext.prg diff --git a/harbour/tests/funcarr.prg b/tests/funcarr.prg similarity index 100% rename from harbour/tests/funcarr.prg rename to tests/funcarr.prg diff --git a/harbour/tests/fwdref.prg b/tests/fwdref.prg similarity index 100% rename from harbour/tests/fwdref.prg rename to tests/fwdref.prg diff --git a/harbour/tests/get.prg b/tests/get.prg similarity index 100% rename from harbour/tests/get.prg rename to tests/get.prg diff --git a/harbour/tests/gfx.prg b/tests/gfx.prg similarity index 100% rename from harbour/tests/gfx.prg rename to tests/gfx.prg diff --git a/harbour/tests/gfx2.prg b/tests/gfx2.prg similarity index 100% rename from harbour/tests/gfx2.prg rename to tests/gfx2.prg diff --git a/harbour/tests/gtapi.c b/tests/gtapi.c similarity index 100% rename from harbour/tests/gtapi.c rename to tests/gtapi.c diff --git a/harbour/tests/gtchars.prg b/tests/gtchars.prg similarity index 100% rename from harbour/tests/gtchars.prg rename to tests/gtchars.prg diff --git a/harbour/tests/gtcolors.prg b/tests/gtcolors.prg similarity index 100% rename from harbour/tests/gtcolors.prg rename to tests/gtcolors.prg diff --git a/harbour/tests/gtkeys.prg b/tests/gtkeys.prg similarity index 100% rename from harbour/tests/gtkeys.prg rename to tests/gtkeys.prg diff --git a/harbour/tests/gtstd.prg b/tests/gtstd.prg similarity index 100% rename from harbour/tests/gtstd.prg rename to tests/gtstd.prg diff --git a/harbour/tests/gtwin.prg b/tests/gtwin.prg similarity index 100% rename from harbour/tests/gtwin.prg rename to tests/gtwin.prg diff --git a/harbour/tests/gtxfnt.prg b/tests/gtxfnt.prg similarity index 100% rename from harbour/tests/gtxfnt.prg rename to tests/gtxfnt.prg diff --git a/harbour/tests/harbour.ini b/tests/harbour.ini similarity index 100% rename from harbour/tests/harbour.ini rename to tests/harbour.ini diff --git a/harbour/tests/hbdoc.prg b/tests/hbdoc.prg similarity index 100% rename from harbour/tests/hbdoc.prg rename to tests/hbdoc.prg diff --git a/harbour/tests/hbdocext.hb b/tests/hbdocext.hb similarity index 100% rename from harbour/tests/hbdocext.hb rename to tests/hbdocext.hb diff --git a/harbour/tests/hbinline.prg b/tests/hbinline.prg similarity index 100% rename from harbour/tests/hbinline.prg rename to tests/hbinline.prg diff --git a/harbour/tests/hbmk.hbm b/tests/hbmk.hbm similarity index 100% rename from harbour/tests/hbmk.hbm rename to tests/hbmk.hbm diff --git a/harbour/tests/hbpptest/compare.bat b/tests/hbpptest/compare.bat similarity index 100% rename from harbour/tests/hbpptest/compare.bat rename to tests/hbpptest/compare.bat diff --git a/harbour/tests/hbpptest/hbpptest.hbp b/tests/hbpptest/hbpptest.hbp similarity index 100% rename from harbour/tests/hbpptest/hbpptest.hbp rename to tests/hbpptest/hbpptest.hbp diff --git a/harbour/tests/hbpptest/hbpptest.prg b/tests/hbpptest/hbpptest.prg similarity index 100% rename from harbour/tests/hbpptest/hbpptest.prg rename to tests/hbpptest/hbpptest.prg diff --git a/harbour/tests/hbpptest/pp_test.prg b/tests/hbpptest/pp_test.prg similarity index 100% rename from harbour/tests/hbpptest/pp_test.prg rename to tests/hbpptest/pp_test.prg diff --git a/harbour/tests/hello.prg b/tests/hello.prg similarity index 100% rename from harbour/tests/hello.prg rename to tests/hello.prg diff --git a/harbour/tests/hrb.prg b/tests/hrb.prg similarity index 100% rename from harbour/tests/hrb.prg rename to tests/hrb.prg diff --git a/harbour/tests/hrbext.prg b/tests/hrbext.prg similarity index 100% rename from harbour/tests/hrbext.prg rename to tests/hrbext.prg diff --git a/harbour/tests/hsx.prg b/tests/hsx.prg similarity index 100% rename from harbour/tests/hsx.prg rename to tests/hsx.prg diff --git a/harbour/tests/html.prg b/tests/html.prg similarity index 100% rename from harbour/tests/html.prg rename to tests/html.prg diff --git a/harbour/tests/idle.prg b/tests/idle.prg similarity index 100% rename from harbour/tests/idle.prg rename to tests/idle.prg diff --git a/harbour/tests/ifelse.prg b/tests/ifelse.prg similarity index 100% rename from harbour/tests/ifelse.prg rename to tests/ifelse.prg diff --git a/harbour/tests/ifinline.prg b/tests/ifinline.prg similarity index 100% rename from harbour/tests/ifinline.prg rename to tests/ifinline.prg diff --git a/harbour/tests/inherit.prg b/tests/inherit.prg similarity index 100% rename from harbour/tests/inherit.prg rename to tests/inherit.prg diff --git a/harbour/tests/inhprob.prg b/tests/inhprob.prg similarity index 100% rename from harbour/tests/inhprob.prg rename to tests/inhprob.prg diff --git a/harbour/tests/inifiles.prg b/tests/inifiles.prg similarity index 100% rename from harbour/tests/inifiles.prg rename to tests/inifiles.prg diff --git a/harbour/tests/initexit.prg b/tests/initexit.prg similarity index 100% rename from harbour/tests/initexit.prg rename to tests/initexit.prg diff --git a/harbour/tests/initproc.prg b/tests/initproc.prg similarity index 100% rename from harbour/tests/initproc.prg rename to tests/initproc.prg diff --git a/harbour/tests/inkey.prg b/tests/inkey.prg similarity index 100% rename from harbour/tests/inkey.prg rename to tests/inkey.prg diff --git a/harbour/tests/inline.prg b/tests/inline.prg similarity index 100% rename from harbour/tests/inline.prg rename to tests/inline.prg diff --git a/harbour/tests/inline_c.prg b/tests/inline_c.prg similarity index 100% rename from harbour/tests/inline_c.prg rename to tests/inline_c.prg diff --git a/harbour/tests/ipclnt.prg b/tests/ipclnt.prg similarity index 100% rename from harbour/tests/ipclnt.prg rename to tests/ipclnt.prg diff --git a/harbour/tests/ipsvr.prg b/tests/ipsvr.prg similarity index 100% rename from harbour/tests/ipsvr.prg rename to tests/ipsvr.prg diff --git a/harbour/tests/keywords.ch b/tests/keywords.ch similarity index 100% rename from harbour/tests/keywords.ch rename to tests/keywords.ch diff --git a/harbour/tests/keywords.prg b/tests/keywords.prg similarity index 100% rename from harbour/tests/keywords.prg rename to tests/keywords.prg diff --git a/harbour/tests/lang2po.hb b/tests/lang2po.hb similarity index 100% rename from harbour/tests/lang2po.hb rename to tests/lang2po.hb diff --git a/harbour/tests/langapi.prg b/tests/langapi.prg similarity index 100% rename from harbour/tests/langapi.prg rename to tests/langapi.prg diff --git a/harbour/tests/langchk.hb b/tests/langchk.hb similarity index 100% rename from harbour/tests/langchk.hb rename to tests/langchk.hb diff --git a/harbour/tests/langmsg.prg b/tests/langmsg.prg similarity index 100% rename from harbour/tests/langmsg.prg rename to tests/langmsg.prg diff --git a/harbour/tests/lbl.prg b/tests/lbl.prg similarity index 100% rename from harbour/tests/lbl.prg rename to tests/lbl.prg diff --git a/harbour/tests/libname.prg b/tests/libname.prg similarity index 100% rename from harbour/tests/libname.prg rename to tests/libname.prg diff --git a/harbour/tests/linecont.prg b/tests/linecont.prg similarity index 100% rename from harbour/tests/linecont.prg rename to tests/linecont.prg diff --git a/harbour/tests/lnlenli1.prg b/tests/lnlenli1.prg similarity index 100% rename from harbour/tests/lnlenli1.prg rename to tests/lnlenli1.prg diff --git a/harbour/tests/lnlenli2.prg b/tests/lnlenli2.prg similarity index 100% rename from harbour/tests/lnlenli2.prg rename to tests/lnlenli2.prg diff --git a/harbour/tests/longdev.prg b/tests/longdev.prg similarity index 100% rename from harbour/tests/longdev.prg rename to tests/longdev.prg diff --git a/harbour/tests/longstr.prg b/tests/longstr.prg similarity index 100% rename from harbour/tests/longstr.prg rename to tests/longstr.prg diff --git a/harbour/tests/longstr2.prg b/tests/longstr2.prg similarity index 100% rename from harbour/tests/longstr2.prg rename to tests/longstr2.prg diff --git a/harbour/tests/macro.prg b/tests/macro.prg similarity index 100% rename from harbour/tests/macro.prg rename to tests/macro.prg diff --git a/harbour/tests/math.prg b/tests/math.prg similarity index 100% rename from harbour/tests/math.prg rename to tests/math.prg diff --git a/harbour/tests/mem.prg b/tests/mem.prg similarity index 100% rename from harbour/tests/mem.prg rename to tests/mem.prg diff --git a/harbour/tests/memfile.prg b/tests/memfile.prg similarity index 100% rename from harbour/tests/memfile.prg rename to tests/memfile.prg diff --git a/harbour/tests/memmgr.prg b/tests/memmgr.prg similarity index 100% rename from harbour/tests/memmgr.prg rename to tests/memmgr.prg diff --git a/harbour/tests/memory.prg b/tests/memory.prg similarity index 100% rename from harbour/tests/memory.prg rename to tests/memory.prg diff --git a/harbour/tests/memvar.prg b/tests/memvar.prg similarity index 100% rename from harbour/tests/memvar.prg rename to tests/memvar.prg diff --git a/harbour/tests/menuto.prg b/tests/menuto.prg similarity index 100% rename from harbour/tests/menuto.prg rename to tests/menuto.prg diff --git a/harbour/tests/money.prg b/tests/money.prg similarity index 100% rename from harbour/tests/money.prg rename to tests/money.prg diff --git a/harbour/tests/mouse.prg b/tests/mouse.prg similarity index 100% rename from harbour/tests/mouse.prg rename to tests/mouse.prg diff --git a/harbour/tests/mt/mttest01.prg b/tests/mt/mttest01.prg similarity index 100% rename from harbour/tests/mt/mttest01.prg rename to tests/mt/mttest01.prg diff --git a/harbour/tests/mt/mttest02.prg b/tests/mt/mttest02.prg similarity index 100% rename from harbour/tests/mt/mttest02.prg rename to tests/mt/mttest02.prg diff --git a/harbour/tests/mt/mttest03.prg b/tests/mt/mttest03.prg similarity index 100% rename from harbour/tests/mt/mttest03.prg rename to tests/mt/mttest03.prg diff --git a/harbour/tests/mt/mttest04.prg b/tests/mt/mttest04.prg similarity index 100% rename from harbour/tests/mt/mttest04.prg rename to tests/mt/mttest04.prg diff --git a/harbour/tests/mt/mttest05.prg b/tests/mt/mttest05.prg similarity index 100% rename from harbour/tests/mt/mttest05.prg rename to tests/mt/mttest05.prg diff --git a/harbour/tests/mt/mttest06.prg b/tests/mt/mttest06.prg similarity index 100% rename from harbour/tests/mt/mttest06.prg rename to tests/mt/mttest06.prg diff --git a/harbour/tests/mt/mttest07.prg b/tests/mt/mttest07.prg similarity index 100% rename from harbour/tests/mt/mttest07.prg rename to tests/mt/mttest07.prg diff --git a/harbour/tests/mt/mttest08.prg b/tests/mt/mttest08.prg similarity index 100% rename from harbour/tests/mt/mttest08.prg rename to tests/mt/mttest08.prg diff --git a/harbour/tests/mt/mttest09.prg b/tests/mt/mttest09.prg similarity index 100% rename from harbour/tests/mt/mttest09.prg rename to tests/mt/mttest09.prg diff --git a/harbour/tests/mt/mttest10.prg b/tests/mt/mttest10.prg similarity index 100% rename from harbour/tests/mt/mttest10.prg rename to tests/mt/mttest10.prg diff --git a/harbour/tests/mt/mttest11.prg b/tests/mt/mttest11.prg similarity index 100% rename from harbour/tests/mt/mttest11.prg rename to tests/mt/mttest11.prg diff --git a/harbour/tests/mt/mttest12.prg b/tests/mt/mttest12.prg similarity index 100% rename from harbour/tests/mt/mttest12.prg rename to tests/mt/mttest12.prg diff --git a/harbour/tests/multiarg.prg b/tests/multiarg.prg similarity index 100% rename from harbour/tests/multiarg.prg rename to tests/multiarg.prg diff --git a/harbour/tests/multifnc/multifnc.hbp b/tests/multifnc/multifnc.hbp similarity index 100% rename from harbour/tests/multifnc/multifnc.hbp rename to tests/multifnc/multifnc.hbp diff --git a/harbour/tests/multifnc/t0.prg b/tests/multifnc/t0.prg similarity index 100% rename from harbour/tests/multifnc/t0.prg rename to tests/multifnc/t0.prg diff --git a/harbour/tests/multifnc/t1.prg b/tests/multifnc/t1.prg similarity index 100% rename from harbour/tests/multifnc/t1.prg rename to tests/multifnc/t1.prg diff --git a/harbour/tests/multifnc/t2.prg b/tests/multifnc/t2.prg similarity index 100% rename from harbour/tests/multifnc/t2.prg rename to tests/multifnc/t2.prg diff --git a/harbour/tests/newrdd.prg b/tests/newrdd.prg similarity index 100% rename from harbour/tests/newrdd.prg rename to tests/newrdd.prg diff --git a/harbour/tests/ntx.prg b/tests/ntx.prg similarity index 100% rename from harbour/tests/ntx.prg rename to tests/ntx.prg diff --git a/harbour/tests/nums.prg b/tests/nums.prg similarity index 100% rename from harbour/tests/nums.prg rename to tests/nums.prg diff --git a/harbour/tests/objarr.prg b/tests/objarr.prg similarity index 100% rename from harbour/tests/objarr.prg rename to tests/objarr.prg diff --git a/harbour/tests/objasign.prg b/tests/objasign.prg similarity index 100% rename from harbour/tests/objasign.prg rename to tests/objasign.prg diff --git a/harbour/tests/objects.prg b/tests/objects.prg similarity index 100% rename from harbour/tests/objects.prg rename to tests/objects.prg diff --git a/harbour/tests/omacro.prg b/tests/omacro.prg similarity index 100% rename from harbour/tests/omacro.prg rename to tests/omacro.prg diff --git a/harbour/tests/onidle.prg b/tests/onidle.prg similarity index 100% rename from harbour/tests/onidle.prg rename to tests/onidle.prg diff --git a/harbour/tests/op.prg b/tests/op.prg similarity index 100% rename from harbour/tests/op.prg rename to tests/op.prg diff --git a/harbour/tests/os.prg b/tests/os.prg similarity index 100% rename from harbour/tests/os.prg rename to tests/os.prg diff --git a/harbour/tests/osshell.prg b/tests/osshell.prg similarity index 100% rename from harbour/tests/osshell.prg rename to tests/osshell.prg diff --git a/harbour/tests/output.prg b/tests/output.prg similarity index 100% rename from harbour/tests/output.prg rename to tests/output.prg diff --git a/harbour/tests/overload.prg b/tests/overload.prg similarity index 100% rename from harbour/tests/overload.prg rename to tests/overload.prg diff --git a/harbour/tests/parexpr.prg b/tests/parexpr.prg similarity index 100% rename from harbour/tests/parexpr.prg rename to tests/parexpr.prg diff --git a/harbour/tests/parseini.ini b/tests/parseini.ini similarity index 100% rename from harbour/tests/parseini.ini rename to tests/parseini.ini diff --git a/harbour/tests/parseini.prg b/tests/parseini.prg similarity index 100% rename from harbour/tests/parseini.prg rename to tests/parseini.prg diff --git a/harbour/tests/parseins.ini b/tests/parseins.ini similarity index 100% rename from harbour/tests/parseins.ini rename to tests/parseins.ini diff --git a/harbour/tests/passref.prg b/tests/passref.prg similarity index 100% rename from harbour/tests/passref.prg rename to tests/passref.prg diff --git a/harbour/tests/persist.prg b/tests/persist.prg similarity index 100% rename from harbour/tests/persist.prg rename to tests/persist.prg diff --git a/harbour/tests/pp.prg b/tests/pp.prg similarity index 100% rename from harbour/tests/pp.prg rename to tests/pp.prg diff --git a/harbour/tests/ppapi.prg b/tests/ppapi.prg similarity index 100% rename from harbour/tests/ppapi.prg rename to tests/ppapi.prg diff --git a/harbour/tests/pragma.prg b/tests/pragma.prg similarity index 100% rename from harbour/tests/pragma.prg rename to tests/pragma.prg diff --git a/harbour/tests/procline.prg b/tests/procline.prg similarity index 100% rename from harbour/tests/procline.prg rename to tests/procline.prg diff --git a/harbour/tests/procname.prg b/tests/procname.prg similarity index 100% rename from harbour/tests/procname.prg rename to tests/procname.prg diff --git a/harbour/tests/profiler.prg b/tests/profiler.prg similarity index 100% rename from harbour/tests/profiler.prg rename to tests/profiler.prg diff --git a/harbour/tests/rdd.prg b/tests/rdd.prg similarity index 100% rename from harbour/tests/rdd.prg rename to tests/rdd.prg diff --git a/harbour/tests/rdd2.prg b/tests/rdd2.prg similarity index 100% rename from harbour/tests/rdd2.prg rename to tests/rdd2.prg diff --git a/harbour/tests/rddtest/adscl52.prg b/tests/rddtest/adscl52.prg similarity index 100% rename from harbour/tests/rddtest/adscl52.prg rename to tests/rddtest/adscl52.prg diff --git a/harbour/tests/rddtest/adscl53.prg b/tests/rddtest/adscl53.prg similarity index 100% rename from harbour/tests/rddtest/adscl53.prg rename to tests/rddtest/adscl53.prg diff --git a/harbour/tests/rddtest/cdxcl52.prg b/tests/rddtest/cdxcl52.prg similarity index 100% rename from harbour/tests/rddtest/cdxcl52.prg rename to tests/rddtest/cdxcl52.prg diff --git a/harbour/tests/rddtest/cdxcl53.prg b/tests/rddtest/cdxcl53.prg similarity index 100% rename from harbour/tests/rddtest/cdxcl53.prg rename to tests/rddtest/cdxcl53.prg diff --git a/harbour/tests/rddtest/make_c52.bat b/tests/rddtest/make_c52.bat similarity index 100% rename from harbour/tests/rddtest/make_c52.bat rename to tests/rddtest/make_c52.bat diff --git a/harbour/tests/rddtest/make_c53.bat b/tests/rddtest/make_c53.bat similarity index 100% rename from harbour/tests/rddtest/make_c53.bat rename to tests/rddtest/make_c53.bat diff --git a/harbour/tests/rddtest/ntxcl52.prg b/tests/rddtest/ntxcl52.prg similarity index 100% rename from harbour/tests/rddtest/ntxcl52.prg rename to tests/rddtest/ntxcl52.prg diff --git a/harbour/tests/rddtest/ntxcl53.prg b/tests/rddtest/ntxcl53.prg similarity index 100% rename from harbour/tests/rddtest/ntxcl53.prg rename to tests/rddtest/ntxcl53.prg diff --git a/harbour/tests/rddtest/rddmktst.prg b/tests/rddtest/rddmktst.prg similarity index 100% rename from harbour/tests/rddtest/rddmktst.prg rename to tests/rddtest/rddmktst.prg diff --git a/harbour/tests/rddtest/rddtst.prg b/tests/rddtest/rddtst.prg similarity index 100% rename from harbour/tests/rddtest/rddtst.prg rename to tests/rddtest/rddtst.prg diff --git a/harbour/tests/read.prg b/tests/read.prg similarity index 100% rename from harbour/tests/read.prg rename to tests/read.prg diff --git a/harbour/tests/readhrb.prg b/tests/readhrb.prg similarity index 100% rename from harbour/tests/readhrb.prg rename to tests/readhrb.prg diff --git a/harbour/tests/recursiv.prg b/tests/recursiv.prg similarity index 100% rename from harbour/tests/recursiv.prg rename to tests/recursiv.prg diff --git a/harbour/tests/regex.prg b/tests/regex.prg similarity index 100% rename from harbour/tests/regex.prg rename to tests/regex.prg diff --git a/harbour/tests/regex2.prg b/tests/regex2.prg similarity index 100% rename from harbour/tests/regex2.prg rename to tests/regex2.prg diff --git a/harbour/tests/returns.prg b/tests/returns.prg similarity index 100% rename from harbour/tests/returns.prg rename to tests/returns.prg diff --git a/harbour/tests/round.prg b/tests/round.prg similarity index 100% rename from harbour/tests/round.prg rename to tests/round.prg diff --git a/harbour/tests/rpt.prg b/tests/rpt.prg similarity index 100% rename from harbour/tests/rpt.prg rename to tests/rpt.prg diff --git a/harbour/tests/rto_get.prg b/tests/rto_get.prg similarity index 100% rename from harbour/tests/rto_get.prg rename to tests/rto_get.prg diff --git a/harbour/tests/rto_tb.prg b/tests/rto_tb.prg similarity index 100% rename from harbour/tests/rto_tb.prg rename to tests/rto_tb.prg diff --git a/harbour/tests/say.prg b/tests/say.prg similarity index 100% rename from harbour/tests/say.prg rename to tests/say.prg diff --git a/harbour/tests/sbar.prg b/tests/sbar.prg similarity index 100% rename from harbour/tests/sbar.prg rename to tests/sbar.prg diff --git a/harbour/tests/scroll.prg b/tests/scroll.prg similarity index 100% rename from harbour/tests/scroll.prg rename to tests/scroll.prg diff --git a/harbour/tests/sdf.prg b/tests/sdf.prg similarity index 100% rename from harbour/tests/sdf.prg rename to tests/sdf.prg diff --git a/harbour/tests/seconds.prg b/tests/seconds.prg similarity index 100% rename from harbour/tests/seconds.prg rename to tests/seconds.prg diff --git a/harbour/tests/server.prg b/tests/server.prg similarity index 100% rename from harbour/tests/server.prg rename to tests/server.prg diff --git a/harbour/tests/set.prg b/tests/set.prg similarity index 100% rename from harbour/tests/set.prg rename to tests/set.prg diff --git a/harbour/tests/set_num.prg b/tests/set_num.prg similarity index 100% rename from harbour/tests/set_num.prg rename to tests/set_num.prg diff --git a/harbour/tests/setkeys.prg b/tests/setkeys.prg similarity index 100% rename from harbour/tests/setkeys.prg rename to tests/setkeys.prg diff --git a/harbour/tests/setmode.prg b/tests/setmode.prg similarity index 100% rename from harbour/tests/setmode.prg rename to tests/setmode.prg diff --git a/harbour/tests/sha1.prg b/tests/sha1.prg similarity index 100% rename from harbour/tests/sha1.prg rename to tests/sha1.prg diff --git a/harbour/tests/sha2.prg b/tests/sha2.prg similarity index 100% rename from harbour/tests/sha2.prg rename to tests/sha2.prg diff --git a/harbour/tests/sortbug.prg b/tests/sortbug.prg similarity index 100% rename from harbour/tests/sortbug.prg rename to tests/sortbug.prg diff --git a/harbour/tests/sound.prg b/tests/sound.prg similarity index 100% rename from harbour/tests/sound.prg rename to tests/sound.prg diff --git a/harbour/tests/speed.prg b/tests/speed.prg similarity index 100% rename from harbour/tests/speed.prg rename to tests/speed.prg diff --git a/harbour/tests/speedstr.prg b/tests/speedstr.prg similarity index 100% rename from harbour/tests/speedstr.prg rename to tests/speedstr.prg diff --git a/harbour/tests/speedtst.prg b/tests/speedtst.prg similarity index 100% rename from harbour/tests/speedtst.prg rename to tests/speedtst.prg diff --git a/harbour/tests/statfun.prg b/tests/statfun.prg similarity index 100% rename from harbour/tests/statfun.prg rename to tests/statfun.prg diff --git a/harbour/tests/statics.prg b/tests/statics.prg similarity index 100% rename from harbour/tests/statics.prg rename to tests/statics.prg diff --git a/harbour/tests/statics1.prg b/tests/statics1.prg similarity index 100% rename from harbour/tests/statics1.prg rename to tests/statics1.prg diff --git a/harbour/tests/statics2.prg b/tests/statics2.prg similarity index 100% rename from harbour/tests/statics2.prg rename to tests/statics2.prg diff --git a/harbour/tests/statinit.prg b/tests/statinit.prg similarity index 100% rename from harbour/tests/statinit.prg rename to tests/statinit.prg diff --git a/harbour/tests/str.prg b/tests/str.prg similarity index 100% rename from harbour/tests/str.prg rename to tests/str.prg diff --git a/harbour/tests/strdelim.prg b/tests/strdelim.prg similarity index 100% rename from harbour/tests/strdelim.prg rename to tests/strdelim.prg diff --git a/harbour/tests/stripdoc.hb b/tests/stripdoc.hb similarity index 100% rename from harbour/tests/stripdoc.hb rename to tests/stripdoc.hb diff --git a/harbour/tests/stripem.prg b/tests/stripem.prg similarity index 100% rename from harbour/tests/stripem.prg rename to tests/stripem.prg diff --git a/harbour/tests/stripeol.hb b/tests/stripeol.hb similarity index 100% rename from harbour/tests/stripeol.hb rename to tests/stripeol.hb diff --git a/harbour/tests/switch.prg b/tests/switch.prg similarity index 100% rename from harbour/tests/switch.prg rename to tests/switch.prg diff --git a/harbour/tests/symbolt.prg b/tests/symbolt.prg similarity index 100% rename from harbour/tests/symbolt.prg rename to tests/symbolt.prg diff --git a/harbour/tests/t1.prg b/tests/t1.prg similarity index 100% rename from harbour/tests/t1.prg rename to tests/t1.prg diff --git a/harbour/tests/tb1.prg b/tests/tb1.prg similarity index 100% rename from harbour/tests/tb1.prg rename to tests/tb1.prg diff --git a/harbour/tests/tbrowse.prg b/tests/tbrowse.prg similarity index 100% rename from harbour/tests/tbrowse.prg rename to tests/tbrowse.prg diff --git a/harbour/tests/test.dbf b/tests/test.dbf similarity index 100% rename from harbour/tests/test.dbf rename to tests/test.dbf diff --git a/harbour/tests/test.frm b/tests/test.frm similarity index 100% rename from harbour/tests/test.frm rename to tests/test.frm diff --git a/harbour/tests/test.lbl b/tests/test.lbl similarity index 100% rename from harbour/tests/test.lbl rename to tests/test.lbl diff --git a/harbour/tests/test.prg b/tests/test.prg similarity index 100% rename from harbour/tests/test.prg rename to tests/test.prg diff --git a/harbour/tests/tflock.prg b/tests/tflock.prg similarity index 100% rename from harbour/tests/tflock.prg rename to tests/tflock.prg diff --git a/harbour/tests/ticktime.prg b/tests/ticktime.prg similarity index 100% rename from harbour/tests/ticktime.prg rename to tests/ticktime.prg diff --git a/harbour/tests/transfrm.prg b/tests/transfrm.prg similarity index 100% rename from harbour/tests/transfrm.prg rename to tests/transfrm.prg diff --git a/harbour/tests/uc16_gen.prg b/tests/uc16_gen.prg similarity index 100% rename from harbour/tests/uc16_gen.prg rename to tests/uc16_gen.prg diff --git a/harbour/tests/use.prg b/tests/use.prg similarity index 100% rename from harbour/tests/use.prg rename to tests/use.prg diff --git a/harbour/tests/usrrdd/exarr.prg b/tests/usrrdd/exarr.prg similarity index 100% rename from harbour/tests/usrrdd/exarr.prg rename to tests/usrrdd/exarr.prg diff --git a/harbour/tests/usrrdd/exfcm.prg b/tests/usrrdd/exfcm.prg similarity index 100% rename from harbour/tests/usrrdd/exfcm.prg rename to tests/usrrdd/exfcm.prg diff --git a/harbour/tests/usrrdd/exhsx.prg b/tests/usrrdd/exhsx.prg similarity index 100% rename from harbour/tests/usrrdd/exhsx.prg rename to tests/usrrdd/exhsx.prg diff --git a/harbour/tests/usrrdd/exlog.prg b/tests/usrrdd/exlog.prg similarity index 100% rename from harbour/tests/usrrdd/exlog.prg rename to tests/usrrdd/exlog.prg diff --git a/harbour/tests/usrrdd/exmemo.prg b/tests/usrrdd/exmemo.prg similarity index 100% rename from harbour/tests/usrrdd/exmemo.prg rename to tests/usrrdd/exmemo.prg diff --git a/harbour/tests/usrrdd/exrlx.prg b/tests/usrrdd/exrlx.prg similarity index 100% rename from harbour/tests/usrrdd/exrlx.prg rename to tests/usrrdd/exrlx.prg diff --git a/harbour/tests/utf8at.prg b/tests/utf8at.prg similarity index 100% rename from harbour/tests/utf8at.prg rename to tests/utf8at.prg diff --git a/harbour/tests/varparam.prg b/tests/varparam.prg similarity index 100% rename from harbour/tests/varparam.prg rename to tests/varparam.prg diff --git a/harbour/tests/vars.prg b/tests/vars.prg similarity index 100% rename from harbour/tests/vars.prg rename to tests/vars.prg diff --git a/harbour/tests/vec1.prg b/tests/vec1.prg similarity index 100% rename from harbour/tests/vec1.prg rename to tests/vec1.prg diff --git a/harbour/tests/version.prg b/tests/version.prg similarity index 100% rename from harbour/tests/version.prg rename to tests/version.prg diff --git a/harbour/tests/video.prg b/tests/video.prg similarity index 100% rename from harbour/tests/video.prg rename to tests/video.prg diff --git a/harbour/tests/vmasort.prg b/tests/vmasort.prg similarity index 100% rename from harbour/tests/vmasort.prg rename to tests/vmasort.prg diff --git a/harbour/tests/warnings.prg b/tests/warnings.prg similarity index 100% rename from harbour/tests/warnings.prg rename to tests/warnings.prg diff --git a/harbour/tests/wcecon.prg b/tests/wcecon.prg similarity index 100% rename from harbour/tests/wcecon.prg rename to tests/wcecon.prg diff --git a/harbour/tests/while.prg b/tests/while.prg similarity index 100% rename from harbour/tests/while.prg rename to tests/while.prg diff --git a/harbour/tests/wvt_fs.prg b/tests/wvt_fs.prg similarity index 100% rename from harbour/tests/wvt_fs.prg rename to tests/wvt_fs.prg diff --git a/harbour/tests/wvtext.prg b/tests/wvtext.prg similarity index 100% rename from harbour/tests/wvtext.prg rename to tests/wvtext.prg diff --git a/harbour/utils/Makefile b/utils/Makefile similarity index 100% rename from harbour/utils/Makefile rename to utils/Makefile diff --git a/harbour/utils/hbi18n/Makefile b/utils/hbi18n/Makefile similarity index 100% rename from harbour/utils/hbi18n/Makefile rename to utils/hbi18n/Makefile diff --git a/harbour/utils/hbi18n/hbi18n.hbp b/utils/hbi18n/hbi18n.hbp similarity index 100% rename from harbour/utils/hbi18n/hbi18n.hbp rename to utils/hbi18n/hbi18n.hbp diff --git a/harbour/utils/hbi18n/hbi18n.prg b/utils/hbi18n/hbi18n.prg similarity index 100% rename from harbour/utils/hbi18n/hbi18n.prg rename to utils/hbi18n/hbi18n.prg diff --git a/harbour/utils/hbmk2/Makefile b/utils/hbmk2/Makefile similarity index 100% rename from harbour/utils/hbmk2/Makefile rename to utils/hbmk2/Makefile diff --git a/harbour/utils/hbmk2/examples/contrib.hbc b/utils/hbmk2/examples/contrib.hbc similarity index 100% rename from harbour/utils/hbmk2/examples/contrib.hbc rename to utils/hbmk2/examples/contrib.hbc diff --git a/harbour/utils/hbmk2/examples/plug_bis.hb b/utils/hbmk2/examples/plug_bis.hb similarity index 100% rename from harbour/utils/hbmk2/examples/plug_bis.hb rename to utils/hbmk2/examples/plug_bis.hb diff --git a/harbour/utils/hbmk2/examples/plug_tpl.hb b/utils/hbmk2/examples/plug_tpl.hb similarity index 100% rename from harbour/utils/hbmk2/examples/plug_tpl.hb rename to utils/hbmk2/examples/plug_tpl.hb diff --git a/harbour/utils/hbmk2/examples/xbgtk.hbc b/utils/hbmk2/examples/xbgtk.hbc similarity index 100% rename from harbour/utils/hbmk2/examples/xbgtk.hbc rename to utils/hbmk2/examples/xbgtk.hbc diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/utils/hbmk2/hbmk2.es_PE.po similarity index 100% rename from harbour/utils/hbmk2/hbmk2.es_PE.po rename to utils/hbmk2/hbmk2.es_PE.po diff --git a/harbour/utils/hbmk2/hbmk2.hbp b/utils/hbmk2/hbmk2.hbp similarity index 100% rename from harbour/utils/hbmk2/hbmk2.hbp rename to utils/hbmk2/hbmk2.hbp diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/utils/hbmk2/hbmk2.hu_HU.po similarity index 100% rename from harbour/utils/hbmk2/hbmk2.hu_HU.po rename to utils/hbmk2/hbmk2.hu_HU.po diff --git a/harbour/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg similarity index 100% rename from harbour/utils/hbmk2/hbmk2.prg rename to utils/hbmk2/hbmk2.prg diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/utils/hbmk2/hbmk2.pt_BR.po similarity index 100% rename from harbour/utils/hbmk2/hbmk2.pt_BR.po rename to utils/hbmk2/hbmk2.pt_BR.po diff --git a/harbour/utils/hbmk2/hbmk2.rc b/utils/hbmk2/hbmk2.rc similarity index 100% rename from harbour/utils/hbmk2/hbmk2.rc rename to utils/hbmk2/hbmk2.rc diff --git a/harbour/utils/hbmk2/pkg_dynl.hbm b/utils/hbmk2/pkg_dynl.hbm similarity index 100% rename from harbour/utils/hbmk2/pkg_dynl.hbm rename to utils/hbmk2/pkg_dynl.hbm diff --git a/harbour/utils/hbmk2/pkg_inst.hbm b/utils/hbmk2/pkg_inst.hbm similarity index 100% rename from harbour/utils/hbmk2/pkg_inst.hbm rename to utils/hbmk2/pkg_inst.hbm diff --git a/harbour/utils/hbtest/Makefile b/utils/hbtest/Makefile similarity index 100% rename from harbour/utils/hbtest/Makefile rename to utils/hbtest/Makefile diff --git a/harbour/utils/hbtest/hbtest.hbp b/utils/hbtest/hbtest.hbp similarity index 100% rename from harbour/utils/hbtest/hbtest.hbp rename to utils/hbtest/hbtest.hbp diff --git a/harbour/utils/hbtest/hbtest.prg b/utils/hbtest/hbtest.prg similarity index 100% rename from harbour/utils/hbtest/hbtest.prg rename to utils/hbtest/hbtest.prg diff --git a/harbour/utils/hbtest/make_c5x.bat b/utils/hbtest/make_c5x.bat similarity index 100% rename from harbour/utils/hbtest/make_c5x.bat rename to utils/hbtest/make_c5x.bat diff --git a/harbour/utils/hbtest/make_xpp.bat b/utils/hbtest/make_xpp.bat similarity index 100% rename from harbour/utils/hbtest/make_xpp.bat rename to utils/hbtest/make_xpp.bat diff --git a/harbour/utils/hbtest/rt_array.prg b/utils/hbtest/rt_array.prg similarity index 100% rename from harbour/utils/hbtest/rt_array.prg rename to utils/hbtest/rt_array.prg diff --git a/harbour/utils/hbtest/rt_class.prg b/utils/hbtest/rt_class.prg similarity index 100% rename from harbour/utils/hbtest/rt_class.prg rename to utils/hbtest/rt_class.prg diff --git a/harbour/utils/hbtest/rt_date.prg b/utils/hbtest/rt_date.prg similarity index 100% rename from harbour/utils/hbtest/rt_date.prg rename to utils/hbtest/rt_date.prg diff --git a/harbour/utils/hbtest/rt_file.prg b/utils/hbtest/rt_file.prg similarity index 100% rename from harbour/utils/hbtest/rt_file.prg rename to utils/hbtest/rt_file.prg diff --git a/harbour/utils/hbtest/rt_hvm.prg b/utils/hbtest/rt_hvm.prg similarity index 100% rename from harbour/utils/hbtest/rt_hvm.prg rename to utils/hbtest/rt_hvm.prg diff --git a/harbour/utils/hbtest/rt_hvma.prg b/utils/hbtest/rt_hvma.prg similarity index 100% rename from harbour/utils/hbtest/rt_hvma.prg rename to utils/hbtest/rt_hvma.prg diff --git a/harbour/utils/hbtest/rt_init.ch b/utils/hbtest/rt_init.ch similarity index 100% rename from harbour/utils/hbtest/rt_init.ch rename to utils/hbtest/rt_init.ch diff --git a/harbour/utils/hbtest/rt_main.ch b/utils/hbtest/rt_main.ch similarity index 100% rename from harbour/utils/hbtest/rt_main.ch rename to utils/hbtest/rt_main.ch diff --git a/harbour/utils/hbtest/rt_main.h b/utils/hbtest/rt_main.h similarity index 100% rename from harbour/utils/hbtest/rt_main.h rename to utils/hbtest/rt_main.h diff --git a/harbour/utils/hbtest/rt_math.prg b/utils/hbtest/rt_math.prg similarity index 100% rename from harbour/utils/hbtest/rt_math.prg rename to utils/hbtest/rt_math.prg diff --git a/harbour/utils/hbtest/rt_misc.prg b/utils/hbtest/rt_misc.prg similarity index 100% rename from harbour/utils/hbtest/rt_misc.prg rename to utils/hbtest/rt_misc.prg diff --git a/harbour/utils/hbtest/rt_miscc.c b/utils/hbtest/rt_miscc.c similarity index 100% rename from harbour/utils/hbtest/rt_miscc.c rename to utils/hbtest/rt_miscc.c diff --git a/harbour/utils/hbtest/rt_mt.prg b/utils/hbtest/rt_mt.prg similarity index 100% rename from harbour/utils/hbtest/rt_mt.prg rename to utils/hbtest/rt_mt.prg diff --git a/harbour/utils/hbtest/rt_str.prg b/utils/hbtest/rt_str.prg similarity index 100% rename from harbour/utils/hbtest/rt_str.prg rename to utils/hbtest/rt_str.prg diff --git a/harbour/utils/hbtest/rt_stra.prg b/utils/hbtest/rt_stra.prg similarity index 100% rename from harbour/utils/hbtest/rt_stra.prg rename to utils/hbtest/rt_stra.prg diff --git a/harbour/utils/hbtest/rt_trans.prg b/utils/hbtest/rt_trans.prg similarity index 100% rename from harbour/utils/hbtest/rt_trans.prg rename to utils/hbtest/rt_trans.prg diff --git a/harbour/utils/hbtest/rt_vars.ch b/utils/hbtest/rt_vars.ch similarity index 100% rename from harbour/utils/hbtest/rt_vars.ch rename to utils/hbtest/rt_vars.ch diff --git a/harbour/website/about.html b/website/about.html similarity index 100% rename from harbour/website/about.html rename to website/about.html diff --git a/harbour/website/changelog.html b/website/changelog.html similarity index 100% rename from harbour/website/changelog.html rename to website/changelog.html diff --git a/harbour/website/contact.html b/website/contact.html similarity index 100% rename from harbour/website/contact.html rename to website/contact.html diff --git a/harbour/website/credits.html b/website/credits.html similarity index 100% rename from harbour/website/credits.html rename to website/credits.html diff --git a/harbour/website/crew.html b/website/crew.html similarity index 100% rename from harbour/website/crew.html rename to website/crew.html diff --git a/harbour/website/css/shCore.css b/website/css/shCore.css similarity index 100% rename from harbour/website/css/shCore.css rename to website/css/shCore.css diff --git a/harbour/website/css/shThemeDefault.css b/website/css/shThemeDefault.css similarity index 100% rename from harbour/website/css/shThemeDefault.css rename to website/css/shThemeDefault.css diff --git a/harbour/website/css/styles.css b/website/css/styles.css similarity index 100% rename from harbour/website/css/styles.css rename to website/css/styles.css diff --git a/harbour/website/download.htm b/website/download.htm similarity index 100% rename from harbour/website/download.htm rename to website/download.htm diff --git a/harbour/website/download_contrib.html b/website/download_contrib.html similarity index 100% rename from harbour/website/download_contrib.html rename to website/download_contrib.html diff --git a/harbour/website/empty_template.html b/website/empty_template.html similarity index 100% rename from harbour/website/empty_template.html rename to website/empty_template.html diff --git a/harbour/website/faq/harbour.html b/website/faq/harbour.html similarity index 100% rename from harbour/website/faq/harbour.html rename to website/faq/harbour.html diff --git a/harbour/website/faq/harbour1.html b/website/faq/harbour1.html similarity index 100% rename from harbour/website/faq/harbour1.html rename to website/faq/harbour1.html diff --git a/harbour/website/faq/harbour10.html b/website/faq/harbour10.html similarity index 100% rename from harbour/website/faq/harbour10.html rename to website/faq/harbour10.html diff --git a/harbour/website/faq/harbour11.html b/website/faq/harbour11.html similarity index 100% rename from harbour/website/faq/harbour11.html rename to website/faq/harbour11.html diff --git a/harbour/website/faq/harbour12.html b/website/faq/harbour12.html similarity index 100% rename from harbour/website/faq/harbour12.html rename to website/faq/harbour12.html diff --git a/harbour/website/faq/harbour13.html b/website/faq/harbour13.html similarity index 100% rename from harbour/website/faq/harbour13.html rename to website/faq/harbour13.html diff --git a/harbour/website/faq/harbour14.html b/website/faq/harbour14.html similarity index 100% rename from harbour/website/faq/harbour14.html rename to website/faq/harbour14.html diff --git a/harbour/website/faq/harbour15.html b/website/faq/harbour15.html similarity index 100% rename from harbour/website/faq/harbour15.html rename to website/faq/harbour15.html diff --git a/harbour/website/faq/harbour16.html b/website/faq/harbour16.html similarity index 100% rename from harbour/website/faq/harbour16.html rename to website/faq/harbour16.html diff --git a/harbour/website/faq/harbour17.html b/website/faq/harbour17.html similarity index 100% rename from harbour/website/faq/harbour17.html rename to website/faq/harbour17.html diff --git a/harbour/website/faq/harbour18.html b/website/faq/harbour18.html similarity index 100% rename from harbour/website/faq/harbour18.html rename to website/faq/harbour18.html diff --git a/harbour/website/faq/harbour19.html b/website/faq/harbour19.html similarity index 100% rename from harbour/website/faq/harbour19.html rename to website/faq/harbour19.html diff --git a/harbour/website/faq/harbour2.html b/website/faq/harbour2.html similarity index 100% rename from harbour/website/faq/harbour2.html rename to website/faq/harbour2.html diff --git a/harbour/website/faq/harbour20.html b/website/faq/harbour20.html similarity index 100% rename from harbour/website/faq/harbour20.html rename to website/faq/harbour20.html diff --git a/harbour/website/faq/harbour21.html b/website/faq/harbour21.html similarity index 100% rename from harbour/website/faq/harbour21.html rename to website/faq/harbour21.html diff --git a/harbour/website/faq/harbour22.html b/website/faq/harbour22.html similarity index 100% rename from harbour/website/faq/harbour22.html rename to website/faq/harbour22.html diff --git a/harbour/website/faq/harbour23.html b/website/faq/harbour23.html similarity index 100% rename from harbour/website/faq/harbour23.html rename to website/faq/harbour23.html diff --git a/harbour/website/faq/harbour24.html b/website/faq/harbour24.html similarity index 100% rename from harbour/website/faq/harbour24.html rename to website/faq/harbour24.html diff --git a/harbour/website/faq/harbour25.html b/website/faq/harbour25.html similarity index 100% rename from harbour/website/faq/harbour25.html rename to website/faq/harbour25.html diff --git a/harbour/website/faq/harbour26.html b/website/faq/harbour26.html similarity index 100% rename from harbour/website/faq/harbour26.html rename to website/faq/harbour26.html diff --git a/harbour/website/faq/harbour27.html b/website/faq/harbour27.html similarity index 100% rename from harbour/website/faq/harbour27.html rename to website/faq/harbour27.html diff --git a/harbour/website/faq/harbour28.html b/website/faq/harbour28.html similarity index 100% rename from harbour/website/faq/harbour28.html rename to website/faq/harbour28.html diff --git a/harbour/website/faq/harbour29.html b/website/faq/harbour29.html similarity index 100% rename from harbour/website/faq/harbour29.html rename to website/faq/harbour29.html diff --git a/harbour/website/faq/harbour3.html b/website/faq/harbour3.html similarity index 100% rename from harbour/website/faq/harbour3.html rename to website/faq/harbour3.html diff --git a/harbour/website/faq/harbour30.html b/website/faq/harbour30.html similarity index 100% rename from harbour/website/faq/harbour30.html rename to website/faq/harbour30.html diff --git a/harbour/website/faq/harbour31.html b/website/faq/harbour31.html similarity index 100% rename from harbour/website/faq/harbour31.html rename to website/faq/harbour31.html diff --git a/harbour/website/faq/harbour32.html b/website/faq/harbour32.html similarity index 100% rename from harbour/website/faq/harbour32.html rename to website/faq/harbour32.html diff --git a/harbour/website/faq/harbour33.html b/website/faq/harbour33.html similarity index 100% rename from harbour/website/faq/harbour33.html rename to website/faq/harbour33.html diff --git a/harbour/website/faq/harbour34.html b/website/faq/harbour34.html similarity index 100% rename from harbour/website/faq/harbour34.html rename to website/faq/harbour34.html diff --git a/harbour/website/faq/harbour35.html b/website/faq/harbour35.html similarity index 100% rename from harbour/website/faq/harbour35.html rename to website/faq/harbour35.html diff --git a/harbour/website/faq/harbour36.html b/website/faq/harbour36.html similarity index 100% rename from harbour/website/faq/harbour36.html rename to website/faq/harbour36.html diff --git a/harbour/website/faq/harbour37.html b/website/faq/harbour37.html similarity index 100% rename from harbour/website/faq/harbour37.html rename to website/faq/harbour37.html diff --git a/harbour/website/faq/harbour38.html b/website/faq/harbour38.html similarity index 100% rename from harbour/website/faq/harbour38.html rename to website/faq/harbour38.html diff --git a/harbour/website/faq/harbour39.html b/website/faq/harbour39.html similarity index 100% rename from harbour/website/faq/harbour39.html rename to website/faq/harbour39.html diff --git a/harbour/website/faq/harbour4.html b/website/faq/harbour4.html similarity index 100% rename from harbour/website/faq/harbour4.html rename to website/faq/harbour4.html diff --git a/harbour/website/faq/harbour40.html b/website/faq/harbour40.html similarity index 100% rename from harbour/website/faq/harbour40.html rename to website/faq/harbour40.html diff --git a/harbour/website/faq/harbour41.html b/website/faq/harbour41.html similarity index 100% rename from harbour/website/faq/harbour41.html rename to website/faq/harbour41.html diff --git a/harbour/website/faq/harbour42.html b/website/faq/harbour42.html similarity index 100% rename from harbour/website/faq/harbour42.html rename to website/faq/harbour42.html diff --git a/harbour/website/faq/harbour43.html b/website/faq/harbour43.html similarity index 100% rename from harbour/website/faq/harbour43.html rename to website/faq/harbour43.html diff --git a/harbour/website/faq/harbour44.html b/website/faq/harbour44.html similarity index 100% rename from harbour/website/faq/harbour44.html rename to website/faq/harbour44.html diff --git a/harbour/website/faq/harbour45.html b/website/faq/harbour45.html similarity index 100% rename from harbour/website/faq/harbour45.html rename to website/faq/harbour45.html diff --git a/harbour/website/faq/harbour46.html b/website/faq/harbour46.html similarity index 100% rename from harbour/website/faq/harbour46.html rename to website/faq/harbour46.html diff --git a/harbour/website/faq/harbour47.html b/website/faq/harbour47.html similarity index 100% rename from harbour/website/faq/harbour47.html rename to website/faq/harbour47.html diff --git a/harbour/website/faq/harbour48.html b/website/faq/harbour48.html similarity index 100% rename from harbour/website/faq/harbour48.html rename to website/faq/harbour48.html diff --git a/harbour/website/faq/harbour49.html b/website/faq/harbour49.html similarity index 100% rename from harbour/website/faq/harbour49.html rename to website/faq/harbour49.html diff --git a/harbour/website/faq/harbour5.html b/website/faq/harbour5.html similarity index 100% rename from harbour/website/faq/harbour5.html rename to website/faq/harbour5.html diff --git a/harbour/website/faq/harbour50.html b/website/faq/harbour50.html similarity index 100% rename from harbour/website/faq/harbour50.html rename to website/faq/harbour50.html diff --git a/harbour/website/faq/harbour51.html b/website/faq/harbour51.html similarity index 100% rename from harbour/website/faq/harbour51.html rename to website/faq/harbour51.html diff --git a/harbour/website/faq/harbour52.html b/website/faq/harbour52.html similarity index 100% rename from harbour/website/faq/harbour52.html rename to website/faq/harbour52.html diff --git a/harbour/website/faq/harbour53.html b/website/faq/harbour53.html similarity index 100% rename from harbour/website/faq/harbour53.html rename to website/faq/harbour53.html diff --git a/harbour/website/faq/harbour54.html b/website/faq/harbour54.html similarity index 100% rename from harbour/website/faq/harbour54.html rename to website/faq/harbour54.html diff --git a/harbour/website/faq/harbour55.html b/website/faq/harbour55.html similarity index 100% rename from harbour/website/faq/harbour55.html rename to website/faq/harbour55.html diff --git a/harbour/website/faq/harbour56.html b/website/faq/harbour56.html similarity index 100% rename from harbour/website/faq/harbour56.html rename to website/faq/harbour56.html diff --git a/harbour/website/faq/harbour57.html b/website/faq/harbour57.html similarity index 100% rename from harbour/website/faq/harbour57.html rename to website/faq/harbour57.html diff --git a/harbour/website/faq/harbour58.html b/website/faq/harbour58.html similarity index 100% rename from harbour/website/faq/harbour58.html rename to website/faq/harbour58.html diff --git a/harbour/website/faq/harbour59.html b/website/faq/harbour59.html similarity index 100% rename from harbour/website/faq/harbour59.html rename to website/faq/harbour59.html diff --git a/harbour/website/faq/harbour6.html b/website/faq/harbour6.html similarity index 100% rename from harbour/website/faq/harbour6.html rename to website/faq/harbour6.html diff --git a/harbour/website/faq/harbour60.html b/website/faq/harbour60.html similarity index 100% rename from harbour/website/faq/harbour60.html rename to website/faq/harbour60.html diff --git a/harbour/website/faq/harbour61.html b/website/faq/harbour61.html similarity index 100% rename from harbour/website/faq/harbour61.html rename to website/faq/harbour61.html diff --git a/harbour/website/faq/harbour62.html b/website/faq/harbour62.html similarity index 100% rename from harbour/website/faq/harbour62.html rename to website/faq/harbour62.html diff --git a/harbour/website/faq/harbour63.html b/website/faq/harbour63.html similarity index 100% rename from harbour/website/faq/harbour63.html rename to website/faq/harbour63.html diff --git a/harbour/website/faq/harbour7.html b/website/faq/harbour7.html similarity index 100% rename from harbour/website/faq/harbour7.html rename to website/faq/harbour7.html diff --git a/harbour/website/faq/harbour8.html b/website/faq/harbour8.html similarity index 100% rename from harbour/website/faq/harbour8.html rename to website/faq/harbour8.html diff --git a/harbour/website/faq/harbour9.html b/website/faq/harbour9.html similarity index 100% rename from harbour/website/faq/harbour9.html rename to website/faq/harbour9.html diff --git a/harbour/website/faq/harbour_toc.html b/website/faq/harbour_toc.html similarity index 100% rename from harbour/website/faq/harbour_toc.html rename to website/faq/harbour_toc.html diff --git a/harbour/website/faq/index.html b/website/faq/index.html similarity index 100% rename from harbour/website/faq/index.html rename to website/faq/index.html diff --git a/harbour/website/favicon.ico b/website/favicon.ico similarity index 100% rename from harbour/website/favicon.ico rename to website/favicon.ico diff --git a/harbour/website/images/about.png b/website/images/about.png similarity index 100% rename from harbour/website/images/about.png rename to website/images/about.png diff --git a/harbour/website/images/alert.png b/website/images/alert.png similarity index 100% rename from harbour/website/images/alert.png rename to website/images/alert.png diff --git a/harbour/website/images/arrow_r.gif b/website/images/arrow_r.gif similarity index 100% rename from harbour/website/images/arrow_r.gif rename to website/images/arrow_r.gif diff --git a/harbour/website/images/arrow_up.gif b/website/images/arrow_up.gif similarity index 100% rename from harbour/website/images/arrow_up.gif rename to website/images/arrow_up.gif diff --git a/harbour/website/images/bg1.png b/website/images/bg1.png similarity index 100% rename from harbour/website/images/bg1.png rename to website/images/bg1.png diff --git a/harbour/website/images/blank.gif b/website/images/blank.gif similarity index 100% rename from harbour/website/images/blank.gif rename to website/images/blank.gif diff --git a/harbour/website/images/button-blue.jpg b/website/images/button-blue.jpg similarity index 100% rename from harbour/website/images/button-blue.jpg rename to website/images/button-blue.jpg diff --git a/harbour/website/images/button-green.jpg b/website/images/button-green.jpg similarity index 100% rename from harbour/website/images/button-green.jpg rename to website/images/button-green.jpg diff --git a/harbour/website/images/button-info.jpg b/website/images/button-info.jpg similarity index 100% rename from harbour/website/images/button-info.jpg rename to website/images/button-info.jpg diff --git a/harbour/website/images/button-ok.jpg b/website/images/button-ok.jpg similarity index 100% rename from harbour/website/images/button-ok.jpg rename to website/images/button-ok.jpg diff --git a/harbour/website/images/button-red.jpg b/website/images/button-red.jpg similarity index 100% rename from harbour/website/images/button-red.jpg rename to website/images/button-red.jpg diff --git a/harbour/website/images/button-withe.jpg b/website/images/button-withe.jpg similarity index 100% rename from harbour/website/images/button-withe.jpg rename to website/images/button-withe.jpg diff --git a/harbour/website/images/button-yellow.jpg b/website/images/button-yellow.jpg similarity index 100% rename from harbour/website/images/button-yellow.jpg rename to website/images/button-yellow.jpg diff --git a/harbour/website/images/cca_nominate-2.png b/website/images/cca_nominate-2.png similarity index 100% rename from harbour/website/images/cca_nominate-2.png rename to website/images/cca_nominate-2.png diff --git a/harbour/website/images/cca_nominate.png b/website/images/cca_nominate.png similarity index 100% rename from harbour/website/images/cca_nominate.png rename to website/images/cca_nominate.png diff --git a/harbour/website/images/crew.png b/website/images/crew.png similarity index 100% rename from harbour/website/images/crew.png rename to website/images/crew.png diff --git a/harbour/website/images/development.png b/website/images/development.png similarity index 100% rename from harbour/website/images/development.png rename to website/images/development.png diff --git a/harbour/website/images/documentation.png b/website/images/documentation.png similarity index 100% rename from harbour/website/images/documentation.png rename to website/images/documentation.png diff --git a/harbour/website/images/downloads.png b/website/images/downloads.png similarity index 100% rename from harbour/website/images/downloads.png rename to website/images/downloads.png diff --git a/harbour/website/images/file-doc.png b/website/images/file-doc.png similarity index 100% rename from harbour/website/images/file-doc.png rename to website/images/file-doc.png diff --git a/harbour/website/images/fill-gradient-no-meio.jpg b/website/images/fill-gradient-no-meio.jpg similarity index 100% rename from harbour/website/images/fill-gradient-no-meio.jpg rename to website/images/fill-gradient-no-meio.jpg diff --git a/harbour/website/images/flagbr.png b/website/images/flagbr.png similarity index 100% rename from harbour/website/images/flagbr.png rename to website/images/flagbr.png diff --git a/harbour/website/images/flages.png b/website/images/flages.png similarity index 100% rename from harbour/website/images/flages.png rename to website/images/flages.png diff --git a/harbour/website/images/flageua.png b/website/images/flageua.png similarity index 100% rename from harbour/website/images/flageua.png rename to website/images/flageua.png diff --git a/harbour/website/images/flags/australia.jpg b/website/images/flags/australia.jpg similarity index 100% rename from harbour/website/images/flags/australia.jpg rename to website/images/flags/australia.jpg diff --git a/harbour/website/images/flags/belgium.jpg b/website/images/flags/belgium.jpg similarity index 100% rename from harbour/website/images/flags/belgium.jpg rename to website/images/flags/belgium.jpg diff --git a/harbour/website/images/flags/brazil.jpg b/website/images/flags/brazil.jpg similarity index 100% rename from harbour/website/images/flags/brazil.jpg rename to website/images/flags/brazil.jpg diff --git a/harbour/website/images/flags/canada.jpg b/website/images/flags/canada.jpg similarity index 100% rename from harbour/website/images/flags/canada.jpg rename to website/images/flags/canada.jpg diff --git a/harbour/website/images/flags/chile.jpg b/website/images/flags/chile.jpg similarity index 100% rename from harbour/website/images/flags/chile.jpg rename to website/images/flags/chile.jpg diff --git a/harbour/website/images/flags/germany.jpg b/website/images/flags/germany.jpg similarity index 100% rename from harbour/website/images/flags/germany.jpg rename to website/images/flags/germany.jpg diff --git a/harbour/website/images/flags/hungary.jpg b/website/images/flags/hungary.jpg similarity index 100% rename from harbour/website/images/flags/hungary.jpg rename to website/images/flags/hungary.jpg diff --git a/harbour/website/images/flags/india.jpg b/website/images/flags/india.jpg similarity index 100% rename from harbour/website/images/flags/india.jpg rename to website/images/flags/india.jpg diff --git a/harbour/website/images/flags/indonesia.jpg b/website/images/flags/indonesia.jpg similarity index 100% rename from harbour/website/images/flags/indonesia.jpg rename to website/images/flags/indonesia.jpg diff --git a/harbour/website/images/flags/israel.jpg b/website/images/flags/israel.jpg similarity index 100% rename from harbour/website/images/flags/israel.jpg rename to website/images/flags/israel.jpg diff --git a/harbour/website/images/flags/italy.jpg b/website/images/flags/italy.jpg similarity index 100% rename from harbour/website/images/flags/italy.jpg rename to website/images/flags/italy.jpg diff --git a/harbour/website/images/flags/korea.jpg b/website/images/flags/korea.jpg similarity index 100% rename from harbour/website/images/flags/korea.jpg rename to website/images/flags/korea.jpg diff --git a/harbour/website/images/flags/netherlands.jpg b/website/images/flags/netherlands.jpg similarity index 100% rename from harbour/website/images/flags/netherlands.jpg rename to website/images/flags/netherlands.jpg diff --git a/harbour/website/images/flags/poland.jpg b/website/images/flags/poland.jpg similarity index 100% rename from harbour/website/images/flags/poland.jpg rename to website/images/flags/poland.jpg diff --git a/harbour/website/images/flags/russia.jpg b/website/images/flags/russia.jpg similarity index 100% rename from harbour/website/images/flags/russia.jpg rename to website/images/flags/russia.jpg diff --git a/harbour/website/images/flags/scotland.jpg b/website/images/flags/scotland.jpg similarity index 100% rename from harbour/website/images/flags/scotland.jpg rename to website/images/flags/scotland.jpg diff --git a/harbour/website/images/flags/spain.jpg b/website/images/flags/spain.jpg similarity index 100% rename from harbour/website/images/flags/spain.jpg rename to website/images/flags/spain.jpg diff --git a/harbour/website/images/flags/unknown.png b/website/images/flags/unknown.png similarity index 100% rename from harbour/website/images/flags/unknown.png rename to website/images/flags/unknown.png diff --git a/harbour/website/images/flags/usa.jpg b/website/images/flags/usa.jpg similarity index 100% rename from harbour/website/images/flags/usa.jpg rename to website/images/flags/usa.jpg diff --git a/harbour/website/images/footer.gif b/website/images/footer.gif similarity index 100% rename from harbour/website/images/footer.gif rename to website/images/footer.gif diff --git a/harbour/website/images/grid-amarelo3.png b/website/images/grid-amarelo3.png similarity index 100% rename from harbour/website/images/grid-amarelo3.png rename to website/images/grid-amarelo3.png diff --git a/harbour/website/images/harbour.ico b/website/images/harbour.ico similarity index 100% rename from harbour/website/images/harbour.ico rename to website/images/harbour.ico diff --git a/harbour/website/images/harbourart.png b/website/images/harbourart.png similarity index 100% rename from harbour/website/images/harbourart.png rename to website/images/harbourart.png diff --git a/harbour/website/images/header_01.jpg b/website/images/header_01.jpg similarity index 100% rename from harbour/website/images/header_01.jpg rename to website/images/header_01.jpg diff --git a/harbour/website/images/header_02.jpg b/website/images/header_02.jpg similarity index 100% rename from harbour/website/images/header_02.jpg rename to website/images/header_02.jpg diff --git a/harbour/website/images/header_02.png b/website/images/header_02.png similarity index 100% rename from harbour/website/images/header_02.png rename to website/images/header_02.png diff --git a/harbour/website/images/header_03.png b/website/images/header_03.png similarity index 100% rename from harbour/website/images/header_03.png rename to website/images/header_03.png diff --git a/harbour/website/images/header_04.png b/website/images/header_04.png similarity index 100% rename from harbour/website/images/header_04.png rename to website/images/header_04.png diff --git a/harbour/website/images/header_05.png b/website/images/header_05.png similarity index 100% rename from harbour/website/images/header_05.png rename to website/images/header_05.png diff --git a/harbour/website/images/header_06.png b/website/images/header_06.png similarity index 100% rename from harbour/website/images/header_06.png rename to website/images/header_06.png diff --git a/harbour/website/images/header_07.png b/website/images/header_07.png similarity index 100% rename from harbour/website/images/header_07.png rename to website/images/header_07.png diff --git a/harbour/website/images/header_08.png b/website/images/header_08.png similarity index 100% rename from harbour/website/images/header_08.png rename to website/images/header_08.png diff --git a/harbour/website/images/header_09.png b/website/images/header_09.png similarity index 100% rename from harbour/website/images/header_09.png rename to website/images/header_09.png diff --git a/harbour/website/images/header_10.png b/website/images/header_10.png similarity index 100% rename from harbour/website/images/header_10.png rename to website/images/header_10.png diff --git a/harbour/website/images/header_11.png b/website/images/header_11.png similarity index 100% rename from harbour/website/images/header_11.png rename to website/images/header_11.png diff --git a/harbour/website/images/header_12.png b/website/images/header_12.png similarity index 100% rename from harbour/website/images/header_12.png rename to website/images/header_12.png diff --git a/harbour/website/images/header_13.png b/website/images/header_13.png similarity index 100% rename from harbour/website/images/header_13.png rename to website/images/header_13.png diff --git a/harbour/website/images/header_14.png b/website/images/header_14.png similarity index 100% rename from harbour/website/images/header_14.png rename to website/images/header_14.png diff --git a/harbour/website/images/header_15.png b/website/images/header_15.png similarity index 100% rename from harbour/website/images/header_15.png rename to website/images/header_15.png diff --git a/harbour/website/images/header_16.png b/website/images/header_16.png similarity index 100% rename from harbour/website/images/header_16.png rename to website/images/header_16.png diff --git a/harbour/website/images/header_17.png b/website/images/header_17.png similarity index 100% rename from harbour/website/images/header_17.png rename to website/images/header_17.png diff --git a/harbour/website/images/header_18.png b/website/images/header_18.png similarity index 100% rename from harbour/website/images/header_18.png rename to website/images/header_18.png diff --git a/harbour/website/images/header_19.png b/website/images/header_19.png similarity index 100% rename from harbour/website/images/header_19.png rename to website/images/header_19.png diff --git a/harbour/website/images/header_20.png b/website/images/header_20.png similarity index 100% rename from harbour/website/images/header_20.png rename to website/images/header_20.png diff --git a/harbour/website/images/header_21.png b/website/images/header_21.png similarity index 100% rename from harbour/website/images/header_21.png rename to website/images/header_21.png diff --git a/harbour/website/images/header_22.png b/website/images/header_22.png similarity index 100% rename from harbour/website/images/header_22.png rename to website/images/header_22.png diff --git a/harbour/website/images/header_23.png b/website/images/header_23.png similarity index 100% rename from harbour/website/images/header_23.png rename to website/images/header_23.png diff --git a/harbour/website/images/header_24.png b/website/images/header_24.png similarity index 100% rename from harbour/website/images/header_24.png rename to website/images/header_24.png diff --git a/harbour/website/images/header_25.png b/website/images/header_25.png similarity index 100% rename from harbour/website/images/header_25.png rename to website/images/header_25.png diff --git a/harbour/website/images/header_26.png b/website/images/header_26.png similarity index 100% rename from harbour/website/images/header_26.png rename to website/images/header_26.png diff --git a/harbour/website/images/header_27.png b/website/images/header_27.png similarity index 100% rename from harbour/website/images/header_27.png rename to website/images/header_27.png diff --git a/harbour/website/images/helmet.png b/website/images/helmet.png similarity index 100% rename from harbour/website/images/helmet.png rename to website/images/helmet.png diff --git a/harbour/website/images/home.png b/website/images/home.png similarity index 100% rename from harbour/website/images/home.png rename to website/images/home.png diff --git a/harbour/website/images/interfaces.png b/website/images/interfaces.png similarity index 100% rename from harbour/website/images/interfaces.png rename to website/images/interfaces.png diff --git a/harbour/website/images/language_en.png b/website/images/language_en.png similarity index 100% rename from harbour/website/images/language_en.png rename to website/images/language_en.png diff --git a/harbour/website/images/library.png b/website/images/library.png similarity index 100% rename from harbour/website/images/library.png rename to website/images/library.png diff --git a/harbour/website/images/menu-bg-grd.jpg b/website/images/menu-bg-grd.jpg similarity index 100% rename from harbour/website/images/menu-bg-grd.jpg rename to website/images/menu-bg-grd.jpg diff --git a/harbour/website/images/menu-bg.gif b/website/images/menu-bg.gif similarity index 100% rename from harbour/website/images/menu-bg.gif rename to website/images/menu-bg.gif diff --git a/harbour/website/images/menu-bg2.gif b/website/images/menu-bg2.gif similarity index 100% rename from harbour/website/images/menu-bg2.gif rename to website/images/menu-bg2.gif diff --git a/harbour/website/images/menu-bg2.png b/website/images/menu-bg2.png similarity index 100% rename from harbour/website/images/menu-bg2.png rename to website/images/menu-bg2.png diff --git a/harbour/website/images/mobile2.png b/website/images/mobile2.png similarity index 100% rename from harbour/website/images/mobile2.png rename to website/images/mobile2.png diff --git a/harbour/website/images/more-samples.png b/website/images/more-samples.png similarity index 100% rename from harbour/website/images/more-samples.png rename to website/images/more-samples.png diff --git a/harbour/website/images/news.gif b/website/images/news.gif similarity index 100% rename from harbour/website/images/news.gif rename to website/images/news.gif diff --git a/harbour/website/images/news.png b/website/images/news.png similarity index 100% rename from harbour/website/images/news.png rename to website/images/news.png diff --git a/harbour/website/images/partners/cailer.png b/website/images/partners/cailer.png similarity index 100% rename from harbour/website/images/partners/cailer.png rename to website/images/partners/cailer.png diff --git a/harbour/website/images/partners/clip2win.jpg b/website/images/partners/clip2win.jpg similarity index 100% rename from harbour/website/images/partners/clip2win.jpg rename to website/images/partners/clip2win.jpg diff --git a/harbour/website/images/partners/easyreport.png b/website/images/partners/easyreport.png similarity index 100% rename from harbour/website/images/partners/easyreport.png rename to website/images/partners/easyreport.png diff --git a/harbour/website/images/partners/fw.jpg b/website/images/partners/fw.jpg similarity index 100% rename from harbour/website/images/partners/fw.jpg rename to website/images/partners/fw.jpg diff --git a/harbour/website/images/partners/hwgui.png b/website/images/partners/hwgui.png similarity index 100% rename from harbour/website/images/partners/hwgui.png rename to website/images/partners/hwgui.png diff --git a/harbour/website/images/partners/minigui.png b/website/images/partners/minigui.png similarity index 100% rename from harbour/website/images/partners/minigui.png rename to website/images/partners/minigui.png diff --git a/harbour/website/images/partners/oohg.jpg b/website/images/partners/oohg.jpg similarity index 100% rename from harbour/website/images/partners/oohg.jpg rename to website/images/partners/oohg.jpg diff --git a/harbour/website/images/partners/otc.png b/website/images/partners/otc.png similarity index 100% rename from harbour/website/images/partners/otc.png rename to website/images/partners/otc.png diff --git a/harbour/website/images/partners/sybase.jpg b/website/images/partners/sybase.jpg similarity index 100% rename from harbour/website/images/partners/sybase.jpg rename to website/images/partners/sybase.jpg diff --git a/harbour/website/images/partners/viaopen.jpg b/website/images/partners/viaopen.jpg similarity index 100% rename from harbour/website/images/partners/viaopen.jpg rename to website/images/partners/viaopen.jpg diff --git a/harbour/website/images/partners/vistasoft.jpg b/website/images/partners/vistasoft.jpg similarity index 100% rename from harbour/website/images/partners/vistasoft.jpg rename to website/images/partners/vistasoft.jpg diff --git a/harbour/website/images/partners/wxharbour.jpg b/website/images/partners/wxharbour.jpg similarity index 100% rename from harbour/website/images/partners/wxharbour.jpg rename to website/images/partners/wxharbour.jpg diff --git a/harbour/website/images/partners/xbgtk.jpg b/website/images/partners/xbgtk.jpg similarity index 100% rename from harbour/website/images/partners/xbgtk.jpg rename to website/images/partners/xbgtk.jpg diff --git a/harbour/website/images/partners/xhgtk.jpg b/website/images/partners/xhgtk.jpg similarity index 100% rename from harbour/website/images/partners/xhgtk.jpg rename to website/images/partners/xhgtk.jpg diff --git a/harbour/website/images/screen-capture.png b/website/images/screen-capture.png similarity index 100% rename from harbour/website/images/screen-capture.png rename to website/images/screen-capture.png diff --git a/harbour/website/images/search-blue.png b/website/images/search-blue.png similarity index 100% rename from harbour/website/images/search-blue.png rename to website/images/search-blue.png diff --git a/harbour/website/images/sql.png b/website/images/sql.png similarity index 100% rename from harbour/website/images/sql.png rename to website/images/sql.png diff --git a/harbour/website/images/table-azul-bottom-left.gif b/website/images/table-azul-bottom-left.gif similarity index 100% rename from harbour/website/images/table-azul-bottom-left.gif rename to website/images/table-azul-bottom-left.gif diff --git a/harbour/website/images/table-azul-bottom-left.png b/website/images/table-azul-bottom-left.png similarity index 100% rename from harbour/website/images/table-azul-bottom-left.png rename to website/images/table-azul-bottom-left.png diff --git a/harbour/website/images/table-azul-bottom-right.gif b/website/images/table-azul-bottom-right.gif similarity index 100% rename from harbour/website/images/table-azul-bottom-right.gif rename to website/images/table-azul-bottom-right.gif diff --git a/harbour/website/images/table-azul-bottom-right.png b/website/images/table-azul-bottom-right.png similarity index 100% rename from harbour/website/images/table-azul-bottom-right.png rename to website/images/table-azul-bottom-right.png diff --git a/harbour/website/images/table-azul-top-left.gif b/website/images/table-azul-top-left.gif similarity index 100% rename from harbour/website/images/table-azul-top-left.gif rename to website/images/table-azul-top-left.gif diff --git a/harbour/website/images/table-azul-top-left.png b/website/images/table-azul-top-left.png similarity index 100% rename from harbour/website/images/table-azul-top-left.png rename to website/images/table-azul-top-left.png diff --git a/harbour/website/images/table-azul-top-right.gif b/website/images/table-azul-top-right.gif similarity index 100% rename from harbour/website/images/table-azul-top-right.gif rename to website/images/table-azul-top-right.gif diff --git a/harbour/website/images/table-azul-top-right.png b/website/images/table-azul-top-right.png similarity index 100% rename from harbour/website/images/table-azul-top-right.png rename to website/images/table-azul-top-right.png diff --git a/harbour/website/images/team.png b/website/images/team.png similarity index 100% rename from harbour/website/images/team.png rename to website/images/team.png diff --git a/harbour/website/images/up-alt.png b/website/images/up-alt.png similarity index 100% rename from harbour/website/images/up-alt.png rename to website/images/up-alt.png diff --git a/harbour/website/images/uses.png b/website/images/uses.png similarity index 100% rename from harbour/website/images/uses.png rename to website/images/uses.png diff --git a/harbour/website/images/www2.png b/website/images/www2.png similarity index 100% rename from harbour/website/images/www2.png rename to website/images/www2.png diff --git a/harbour/website/images/xml.png b/website/images/xml.png similarity index 100% rename from harbour/website/images/xml.png rename to website/images/xml.png diff --git a/harbour/website/images/xml2.png b/website/images/xml2.png similarity index 100% rename from harbour/website/images/xml2.png rename to website/images/xml2.png diff --git a/harbour/website/index.html b/website/index.html similarity index 100% rename from harbour/website/index.html rename to website/index.html diff --git a/harbour/website/js/shBrushHarbour.js b/website/js/shBrushHarbour.js similarity index 100% rename from harbour/website/js/shBrushHarbour.js rename to website/js/shBrushHarbour.js diff --git a/harbour/website/js/shCore.js b/website/js/shCore.js similarity index 100% rename from harbour/website/js/shCore.js rename to website/js/shCore.js diff --git a/harbour/website/legalnotes.html b/website/legalnotes.html similarity index 100% rename from harbour/website/legalnotes.html rename to website/legalnotes.html diff --git a/harbour/website/logos.html b/website/logos.html similarity index 100% rename from harbour/website/logos.html rename to website/logos.html diff --git a/harbour/website/mailing.html b/website/mailing.html similarity index 100% rename from harbour/website/mailing.html rename to website/mailing.html diff --git a/harbour/website/menu/harbour-menu.js b/website/menu/harbour-menu.js similarity index 100% rename from harbour/website/menu/harbour-menu.js rename to website/menu/harbour-menu.js diff --git a/harbour/website/menu/stcode.js b/website/menu/stcode.js similarity index 100% rename from harbour/website/menu/stcode.js rename to website/menu/stcode.js diff --git a/harbour/website/menu/stdom.js b/website/menu/stdom.js similarity index 100% rename from harbour/website/menu/stdom.js rename to website/menu/stdom.js diff --git a/harbour/website/menu/steffie.js b/website/menu/steffie.js similarity index 100% rename from harbour/website/menu/steffie.js rename to website/menu/steffie.js diff --git a/harbour/website/menu/steffrect.js b/website/menu/steffrect.js similarity index 100% rename from harbour/website/menu/steffrect.js rename to website/menu/steffrect.js diff --git a/harbour/website/menu/steffslip.js b/website/menu/steffslip.js similarity index 100% rename from harbour/website/menu/steffslip.js rename to website/menu/steffslip.js diff --git a/harbour/website/menu/stfilter.js b/website/menu/stfilter.js similarity index 100% rename from harbour/website/menu/stfilter.js rename to website/menu/stfilter.js diff --git a/harbour/website/menu/sthilight.js b/website/menu/sthilight.js similarity index 100% rename from harbour/website/menu/sthilight.js rename to website/menu/sthilight.js diff --git a/harbour/website/menu/stie.js b/website/menu/stie.js similarity index 100% rename from harbour/website/menu/stie.js rename to website/menu/stie.js diff --git a/harbour/website/menu/stinit.js b/website/menu/stinit.js similarity index 100% rename from harbour/website/menu/stinit.js rename to website/menu/stinit.js diff --git a/harbour/website/menu/stmenu.js b/website/menu/stmenu.js similarity index 100% rename from harbour/website/menu/stmenu.js rename to website/menu/stmenu.js diff --git a/harbour/website/menu/stscroll.js b/website/menu/stscroll.js similarity index 100% rename from harbour/website/menu/stscroll.js rename to website/menu/stscroll.js diff --git a/harbour/website/menu/stslip.js b/website/menu/stslip.js similarity index 100% rename from harbour/website/menu/stslip.js rename to website/menu/stslip.js diff --git a/harbour/website/menu/stwinels.js b/website/menu/stwinels.js similarity index 100% rename from harbour/website/menu/stwinels.js rename to website/menu/stwinels.js diff --git a/harbour/website/news.html b/website/news.html similarity index 100% rename from harbour/website/news.html rename to website/news.html diff --git a/harbour/website/news1.html b/website/news1.html similarity index 100% rename from harbour/website/news1.html rename to website/news1.html diff --git a/harbour/website/photos/antoniolinares.jpg b/website/photos/antoniolinares.jpg similarity index 100% rename from harbour/website/photos/antoniolinares.jpg rename to website/photos/antoniolinares.jpg diff --git a/harbour/website/photos/antoniolinares_.jpg b/website/photos/antoniolinares_.jpg similarity index 100% rename from harbour/website/photos/antoniolinares_.jpg rename to website/photos/antoniolinares_.jpg diff --git a/harbour/website/photos/canterobruno.jpg b/website/photos/canterobruno.jpg similarity index 100% rename from harbour/website/photos/canterobruno.jpg rename to website/photos/canterobruno.jpg diff --git a/harbour/website/photos/chenkedem.jpg b/website/photos/chenkedem.jpg similarity index 100% rename from harbour/website/photos/chenkedem.jpg rename to website/photos/chenkedem.jpg diff --git a/harbour/website/photos/davepearson.jpg b/website/photos/davepearson.jpg similarity index 100% rename from harbour/website/photos/davepearson.jpg rename to website/photos/davepearson.jpg diff --git a/harbour/website/photos/davidholm.jpg b/website/photos/davidholm.jpg similarity index 100% rename from harbour/website/photos/davidholm.jpg rename to website/photos/davidholm.jpg diff --git a/harbour/website/photos/dholm-harbour.jpg b/website/photos/dholm-harbour.jpg similarity index 100% rename from harbour/website/photos/dholm-harbour.jpg rename to website/photos/dholm-harbour.jpg diff --git a/harbour/website/photos/dholm-office.jpg b/website/photos/dholm-office.jpg similarity index 100% rename from harbour/website/photos/dholm-office.jpg rename to website/photos/dholm-office.jpg diff --git a/harbour/website/photos/felipecoury.jpg b/website/photos/felipecoury.jpg similarity index 100% rename from harbour/website/photos/felipecoury.jpg rename to website/photos/felipecoury.jpg diff --git a/harbour/website/photos/ignacio_ortiz.jpg b/website/photos/ignacio_ortiz.jpg similarity index 100% rename from harbour/website/photos/ignacio_ortiz.jpg rename to website/photos/ignacio_ortiz.jpg diff --git a/harbour/website/photos/jean_francois_lefebvre.jpg b/website/photos/jean_francois_lefebvre.jpg similarity index 100% rename from harbour/website/photos/jean_francois_lefebvre.jpg rename to website/photos/jean_francois_lefebvre.jpg diff --git a/harbour/website/photos/kodak.gif b/website/photos/kodak.gif similarity index 100% rename from harbour/website/photos/kodak.gif rename to website/photos/kodak.gif diff --git a/harbour/website/photos/kwonohchul.jpg b/website/photos/kwonohchul.jpg similarity index 100% rename from harbour/website/photos/kwonohchul.jpg rename to website/photos/kwonohchul.jpg diff --git a/harbour/website/photos/luizculik.jpg b/website/photos/luizculik.jpg similarity index 100% rename from harbour/website/photos/luizculik.jpg rename to website/photos/luizculik.jpg diff --git a/harbour/website/photos/martin_vogel_2.jpg b/website/photos/martin_vogel_2.jpg similarity index 100% rename from harbour/website/photos/martin_vogel_2.jpg rename to website/photos/martin_vogel_2.jpg diff --git a/harbour/website/photos/matt_hamilton.jpg b/website/photos/matt_hamilton.jpg similarity index 100% rename from harbour/website/photos/matt_hamilton.jpg rename to website/photos/matt_hamilton.jpg diff --git a/harbour/website/photos/matteobaccan.jpg b/website/photos/matteobaccan.jpg similarity index 100% rename from harbour/website/photos/matteobaccan.jpg rename to website/photos/matteobaccan.jpg diff --git a/harbour/website/photos/mauriliolongo.jpg b/website/photos/mauriliolongo.jpg similarity index 100% rename from harbour/website/photos/mauriliolongo.jpg rename to website/photos/mauriliolongo.jpg diff --git a/harbour/website/photos/patrickmast.jpg b/website/photos/patrickmast.jpg similarity index 100% rename from harbour/website/photos/patrickmast.jpg rename to website/photos/patrickmast.jpg diff --git a/harbour/website/photos/patrickmast2.jpg b/website/photos/patrickmast2.jpg similarity index 100% rename from harbour/website/photos/patrickmast2.jpg rename to website/photos/patrickmast2.jpg diff --git a/harbour/website/photos/patrickmast3.jpg b/website/photos/patrickmast3.jpg similarity index 100% rename from harbour/website/photos/patrickmast3.jpg rename to website/photos/patrickmast3.jpg diff --git a/harbour/website/photos/paultucker.jpg b/website/photos/paultucker.jpg similarity index 100% rename from harbour/website/photos/paultucker.jpg rename to website/photos/paultucker.jpg diff --git a/harbour/website/photos/philbarnett.jpg b/website/photos/philbarnett.jpg similarity index 100% rename from harbour/website/photos/philbarnett.jpg rename to website/photos/philbarnett.jpg diff --git a/harbour/website/photos/richard_alexandre_cuylen.jpg b/website/photos/richard_alexandre_cuylen.jpg similarity index 100% rename from harbour/website/photos/richard_alexandre_cuylen.jpg rename to website/photos/richard_alexandre_cuylen.jpg diff --git a/harbour/website/photos/ron_pinkas.jpg b/website/photos/ron_pinkas.jpg similarity index 100% rename from harbour/website/photos/ron_pinkas.jpg rename to website/photos/ron_pinkas.jpg diff --git a/harbour/website/photos/tstone.jpg b/website/photos/tstone.jpg similarity index 100% rename from harbour/website/photos/tstone.jpg rename to website/photos/tstone.jpg diff --git a/harbour/website/photos/vailtonrenato.jpg b/website/photos/vailtonrenato.jpg similarity index 100% rename from harbour/website/photos/vailtonrenato.jpg rename to website/photos/vailtonrenato.jpg diff --git a/harbour/website/photos/vailtonrenato2.jpg b/website/photos/vailtonrenato2.jpg similarity index 100% rename from harbour/website/photos/vailtonrenato2.jpg rename to website/photos/vailtonrenato2.jpg diff --git a/harbour/website/photos/vladimir_kazimirchik.jpg b/website/photos/vladimir_kazimirchik.jpg similarity index 100% rename from harbour/website/photos/vladimir_kazimirchik.jpg rename to website/photos/vladimir_kazimirchik.jpg diff --git a/harbour/website/robots.txt b/website/robots.txt similarity index 100% rename from harbour/website/robots.txt rename to website/robots.txt diff --git a/harbour/website/samples.html b/website/samples.html similarity index 100% rename from harbour/website/samples.html rename to website/samples.html diff --git a/harbour/website/samples/HowToBuildOnLinux.html b/website/samples/HowToBuildOnLinux.html similarity index 100% rename from harbour/website/samples/HowToBuildOnLinux.html rename to website/samples/HowToBuildOnLinux.html diff --git a/harbour/website/samples/HowToBuildOnWindows.html b/website/samples/HowToBuildOnWindows.html similarity index 100% rename from harbour/website/samples/HowToBuildOnWindows.html rename to website/samples/HowToBuildOnWindows.html diff --git a/harbour/website/samples/array16.html b/website/samples/array16.html similarity index 100% rename from harbour/website/samples/array16.html rename to website/samples/array16.html diff --git a/harbour/website/samples/array16.prg.html b/website/samples/array16.prg.html similarity index 100% rename from harbour/website/samples/array16.prg.html rename to website/samples/array16.prg.html diff --git a/harbour/website/samples/arreval.html b/website/samples/arreval.html similarity index 100% rename from harbour/website/samples/arreval.html rename to website/samples/arreval.html diff --git a/harbour/website/samples/arreval.prg.html b/website/samples/arreval.prg.html similarity index 100% rename from harbour/website/samples/arreval.prg.html rename to website/samples/arreval.prg.html diff --git a/harbour/website/samples/begin.html b/website/samples/begin.html similarity index 100% rename from harbour/website/samples/begin.html rename to website/samples/begin.html diff --git a/harbour/website/samples/begin.prg.html b/website/samples/begin.prg.html similarity index 100% rename from harbour/website/samples/begin.prg.html rename to website/samples/begin.prg.html diff --git a/harbour/website/samples/browse.html b/website/samples/browse.html similarity index 100% rename from harbour/website/samples/browse.html rename to website/samples/browse.html diff --git a/harbour/website/samples/browse.prg.html b/website/samples/browse.prg.html similarity index 100% rename from harbour/website/samples/browse.prg.html rename to website/samples/browse.prg.html diff --git a/harbour/website/samples/byref.html b/website/samples/byref.html similarity index 100% rename from harbour/website/samples/byref.html rename to website/samples/byref.html diff --git a/harbour/website/samples/byref.prg.html b/website/samples/byref.prg.html similarity index 100% rename from harbour/website/samples/byref.prg.html rename to website/samples/byref.prg.html diff --git a/harbour/website/samples/codebl.html b/website/samples/codebl.html similarity index 100% rename from harbour/website/samples/codebl.html rename to website/samples/codebl.html diff --git a/harbour/website/samples/codebl.prg.html b/website/samples/codebl.prg.html similarity index 100% rename from harbour/website/samples/codebl.prg.html rename to website/samples/codebl.prg.html diff --git a/harbour/website/samples/codebloc.html b/website/samples/codebloc.html similarity index 100% rename from harbour/website/samples/codebloc.html rename to website/samples/codebloc.html diff --git a/harbour/website/samples/codebloc.prg.html b/website/samples/codebloc.prg.html similarity index 100% rename from harbour/website/samples/codebloc.prg.html rename to website/samples/codebloc.prg.html diff --git a/harbour/website/samples/dates3.html b/website/samples/dates3.html similarity index 100% rename from harbour/website/samples/dates3.html rename to website/samples/dates3.html diff --git a/harbour/website/samples/dates3.prg.html b/website/samples/dates3.prg.html similarity index 100% rename from harbour/website/samples/dates3.prg.html rename to website/samples/dates3.prg.html diff --git a/harbour/website/samples/foreach.html b/website/samples/foreach.html similarity index 100% rename from harbour/website/samples/foreach.html rename to website/samples/foreach.html diff --git a/harbour/website/samples/foreach.prg.html b/website/samples/foreach.prg.html similarity index 100% rename from harbour/website/samples/foreach.prg.html rename to website/samples/foreach.prg.html diff --git a/harbour/website/samples/hello.html b/website/samples/hello.html similarity index 100% rename from harbour/website/samples/hello.html rename to website/samples/hello.html diff --git a/harbour/website/samples/hello.prg.html b/website/samples/hello.prg.html similarity index 100% rename from harbour/website/samples/hello.prg.html rename to website/samples/hello.prg.html diff --git a/harbour/website/samples/html.html b/website/samples/html.html similarity index 100% rename from harbour/website/samples/html.html rename to website/samples/html.html diff --git a/harbour/website/samples/html.prg.html b/website/samples/html.prg.html similarity index 100% rename from harbour/website/samples/html.prg.html rename to website/samples/html.prg.html diff --git a/harbour/website/samples/idle.html b/website/samples/idle.html similarity index 100% rename from harbour/website/samples/idle.html rename to website/samples/idle.html diff --git a/harbour/website/samples/idle.prg.html b/website/samples/idle.prg.html similarity index 100% rename from harbour/website/samples/idle.prg.html rename to website/samples/idle.prg.html diff --git a/harbour/website/samples/initexit.html b/website/samples/initexit.html similarity index 100% rename from harbour/website/samples/initexit.html rename to website/samples/initexit.html diff --git a/harbour/website/samples/initexit.prg.html b/website/samples/initexit.prg.html similarity index 100% rename from harbour/website/samples/initexit.prg.html rename to website/samples/initexit.prg.html diff --git a/harbour/website/samples/longdev.html b/website/samples/longdev.html similarity index 100% rename from harbour/website/samples/longdev.html rename to website/samples/longdev.html diff --git a/harbour/website/samples/longdev.prg.html b/website/samples/longdev.prg.html similarity index 100% rename from harbour/website/samples/longdev.prg.html rename to website/samples/longdev.prg.html diff --git a/harbour/website/samples/macro.html b/website/samples/macro.html similarity index 100% rename from harbour/website/samples/macro.html rename to website/samples/macro.html diff --git a/harbour/website/samples/macro.prg.html b/website/samples/macro.prg.html similarity index 100% rename from harbour/website/samples/macro.prg.html rename to website/samples/macro.prg.html diff --git a/harbour/website/samples/mouse.html b/website/samples/mouse.html similarity index 100% rename from harbour/website/samples/mouse.html rename to website/samples/mouse.html diff --git a/harbour/website/samples/mouse.prg.html b/website/samples/mouse.prg.html similarity index 100% rename from harbour/website/samples/mouse.prg.html rename to website/samples/mouse.prg.html diff --git a/harbour/website/samples/onidle.html b/website/samples/onidle.html similarity index 100% rename from harbour/website/samples/onidle.html rename to website/samples/onidle.html diff --git a/harbour/website/samples/onidle.prg.html b/website/samples/onidle.prg.html similarity index 100% rename from harbour/website/samples/onidle.prg.html rename to website/samples/onidle.prg.html diff --git a/harbour/website/samples/osshell.html b/website/samples/osshell.html similarity index 100% rename from harbour/website/samples/osshell.html rename to website/samples/osshell.html diff --git a/harbour/website/samples/osshell.prg.html b/website/samples/osshell.prg.html similarity index 100% rename from harbour/website/samples/osshell.prg.html rename to website/samples/osshell.prg.html diff --git a/harbour/website/samples/parseini.html b/website/samples/parseini.html similarity index 100% rename from harbour/website/samples/parseini.html rename to website/samples/parseini.html diff --git a/harbour/website/samples/parseini.ini.html b/website/samples/parseini.ini.html similarity index 100% rename from harbour/website/samples/parseini.ini.html rename to website/samples/parseini.ini.html diff --git a/harbour/website/samples/parseini.prg.html b/website/samples/parseini.prg.html similarity index 100% rename from harbour/website/samples/parseini.prg.html rename to website/samples/parseini.prg.html diff --git a/harbour/website/samples/screenshots/array16_win.png b/website/samples/screenshots/array16_win.png similarity index 100% rename from harbour/website/samples/screenshots/array16_win.png rename to website/samples/screenshots/array16_win.png diff --git a/harbour/website/samples/screenshots/arreval_win.png b/website/samples/screenshots/arreval_win.png similarity index 100% rename from harbour/website/samples/screenshots/arreval_win.png rename to website/samples/screenshots/arreval_win.png diff --git a/harbour/website/samples/screenshots/begin.png b/website/samples/screenshots/begin.png similarity index 100% rename from harbour/website/samples/screenshots/begin.png rename to website/samples/screenshots/begin.png diff --git a/harbour/website/samples/screenshots/browse_linux.png b/website/samples/screenshots/browse_linux.png similarity index 100% rename from harbour/website/samples/screenshots/browse_linux.png rename to website/samples/screenshots/browse_linux.png diff --git a/harbour/website/samples/screenshots/browse_win.png b/website/samples/screenshots/browse_win.png similarity index 100% rename from harbour/website/samples/screenshots/browse_win.png rename to website/samples/screenshots/browse_win.png diff --git a/harbour/website/samples/screenshots/byref_win.png b/website/samples/screenshots/byref_win.png similarity index 100% rename from harbour/website/samples/screenshots/byref_win.png rename to website/samples/screenshots/byref_win.png diff --git a/harbour/website/samples/screenshots/codebl.png b/website/samples/screenshots/codebl.png similarity index 100% rename from harbour/website/samples/screenshots/codebl.png rename to website/samples/screenshots/codebl.png diff --git a/harbour/website/samples/screenshots/codebloc.png b/website/samples/screenshots/codebloc.png similarity index 100% rename from harbour/website/samples/screenshots/codebloc.png rename to website/samples/screenshots/codebloc.png diff --git a/harbour/website/samples/screenshots/dates3_win.png b/website/samples/screenshots/dates3_win.png similarity index 100% rename from harbour/website/samples/screenshots/dates3_win.png rename to website/samples/screenshots/dates3_win.png diff --git a/harbour/website/samples/screenshots/foreach_win.png b/website/samples/screenshots/foreach_win.png similarity index 100% rename from harbour/website/samples/screenshots/foreach_win.png rename to website/samples/screenshots/foreach_win.png diff --git a/harbour/website/samples/screenshots/hello_linux.png b/website/samples/screenshots/hello_linux.png similarity index 100% rename from harbour/website/samples/screenshots/hello_linux.png rename to website/samples/screenshots/hello_linux.png diff --git a/harbour/website/samples/screenshots/hello_win.png b/website/samples/screenshots/hello_win.png similarity index 100% rename from harbour/website/samples/screenshots/hello_win.png rename to website/samples/screenshots/hello_win.png diff --git a/harbour/website/samples/screenshots/html.png b/website/samples/screenshots/html.png similarity index 100% rename from harbour/website/samples/screenshots/html.png rename to website/samples/screenshots/html.png diff --git a/harbour/website/samples/screenshots/idle_win.png b/website/samples/screenshots/idle_win.png similarity index 100% rename from harbour/website/samples/screenshots/idle_win.png rename to website/samples/screenshots/idle_win.png diff --git a/harbour/website/samples/screenshots/initexit_win.png b/website/samples/screenshots/initexit_win.png similarity index 100% rename from harbour/website/samples/screenshots/initexit_win.png rename to website/samples/screenshots/initexit_win.png diff --git a/harbour/website/samples/screenshots/longdev_linux.png b/website/samples/screenshots/longdev_linux.png similarity index 100% rename from harbour/website/samples/screenshots/longdev_linux.png rename to website/samples/screenshots/longdev_linux.png diff --git a/harbour/website/samples/screenshots/macro.png b/website/samples/screenshots/macro.png similarity index 100% rename from harbour/website/samples/screenshots/macro.png rename to website/samples/screenshots/macro.png diff --git a/harbour/website/samples/screenshots/mouse_linux.png b/website/samples/screenshots/mouse_linux.png similarity index 100% rename from harbour/website/samples/screenshots/mouse_linux.png rename to website/samples/screenshots/mouse_linux.png diff --git a/harbour/website/samples/screenshots/mouse_win.png b/website/samples/screenshots/mouse_win.png similarity index 100% rename from harbour/website/samples/screenshots/mouse_win.png rename to website/samples/screenshots/mouse_win.png diff --git a/harbour/website/samples/screenshots/onidle_win.png b/website/samples/screenshots/onidle_win.png similarity index 100% rename from harbour/website/samples/screenshots/onidle_win.png rename to website/samples/screenshots/onidle_win.png diff --git a/harbour/website/samples/screenshots/osshell_linux.png b/website/samples/screenshots/osshell_linux.png similarity index 100% rename from harbour/website/samples/screenshots/osshell_linux.png rename to website/samples/screenshots/osshell_linux.png diff --git a/harbour/website/samples/screenshots/osshell_win.png b/website/samples/screenshots/osshell_win.png similarity index 100% rename from harbour/website/samples/screenshots/osshell_win.png rename to website/samples/screenshots/osshell_win.png diff --git a/harbour/website/samples/screenshots/parseini_linux.png b/website/samples/screenshots/parseini_linux.png similarity index 100% rename from harbour/website/samples/screenshots/parseini_linux.png rename to website/samples/screenshots/parseini_linux.png diff --git a/harbour/website/samples/screenshots/parseini_win.png b/website/samples/screenshots/parseini_win.png similarity index 100% rename from harbour/website/samples/screenshots/parseini_win.png rename to website/samples/screenshots/parseini_win.png diff --git a/harbour/website/samples/screenshots/switch_win.png b/website/samples/screenshots/switch_win.png similarity index 100% rename from harbour/website/samples/screenshots/switch_win.png rename to website/samples/screenshots/switch_win.png diff --git a/harbour/website/samples/screenshots/tbrowse_linux.png b/website/samples/screenshots/tbrowse_linux.png similarity index 100% rename from harbour/website/samples/screenshots/tbrowse_linux.png rename to website/samples/screenshots/tbrowse_linux.png diff --git a/harbour/website/samples/screenshots/tbrowse_win.png b/website/samples/screenshots/tbrowse_win.png similarity index 100% rename from harbour/website/samples/screenshots/tbrowse_win.png rename to website/samples/screenshots/tbrowse_win.png diff --git a/harbour/website/samples/switch.html b/website/samples/switch.html similarity index 100% rename from harbour/website/samples/switch.html rename to website/samples/switch.html diff --git a/harbour/website/samples/switch.prg.html b/website/samples/switch.prg.html similarity index 100% rename from harbour/website/samples/switch.prg.html rename to website/samples/switch.prg.html diff --git a/harbour/website/samples/tbrowse.html b/website/samples/tbrowse.html similarity index 100% rename from harbour/website/samples/tbrowse.html rename to website/samples/tbrowse.html diff --git a/harbour/website/samples/tbrowse.prg.html b/website/samples/tbrowse.prg.html similarity index 100% rename from harbour/website/samples/tbrowse.prg.html rename to website/samples/tbrowse.prg.html diff --git a/harbour/website/snapshot.html b/website/snapshot.html similarity index 100% rename from harbour/website/snapshot.html rename to website/snapshot.html diff --git a/harbour/website/third-party.html b/website/third-party.html similarity index 100% rename from harbour/website/third-party.html rename to website/third-party.html diff --git a/harbour/website/tools.html b/website/tools.html similarity index 100% rename from harbour/website/tools.html rename to website/tools.html diff --git a/harbour/website/tshirts.html b/website/tshirts.html similarity index 100% rename from harbour/website/tshirts.html rename to website/tshirts.html diff --git a/harbour/website/tutorials.html b/website/tutorials.html similarity index 100% rename from harbour/website/tutorials.html rename to website/tutorials.html diff --git a/harbour/win-make.exe b/win-make.exe similarity index 100% rename from harbour/win-make.exe rename to win-make.exe