diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3373f44c1e..9f86ae51f4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,42 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-29 11:04 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  - contrib/examples
+  + examples
+  * doc/dirstruc.txt
+  * doc/whatsnew.txt
+  * examples/hbdoc/Makefile
+  * examples/pp/Makefile
+  * examples/hboleold/Makefile
+  * examples/hbsqlit2/Makefile
+  * examples/misc/Makefile
+  * examples/hbapollo/Makefile
+  * examples/rdddbt/Makefile
+  * examples/guestbk/Makefile
+  * examples/pe/Makefile
+  * examples/hbgf/hbgfwin/Makefile
+  * examples/hbgf/hbgfos2/Makefile
+  * examples/hbgf/hbgfgtk/Makefile
+  * examples/hbgf/Makefile
+  * examples/uhttpd/readme.txt
+  * examples/dbu/Makefile
+  * examples/hscript/Makefile
+  * examples/hbwhat/Makefile
+  * examples/rl/Makefile
+  * examples/Makefile
+    * Moved to flatten our dir layout and sync the locations
+      in unified distro and source tree.
+    ; TODO: As a next step I'll replace Makefiles with .hbm
+            files. This will allow users to build these parts
+            outside the source distribution.
+
+  * doc/man/hbmk.1
+  * utils/hbmk2/examples/fwh.hbc
+  * utils/hbmk2/examples/hmg.hbc
+  * utils/hbmk2/examples/hwgui.hbc
+    * .hbp -> .hbc
+
 2009-05-29 03:50 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed typo causing -i Harbour option missed in make
diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt
index 2dcf25c381..f75add0144 100644
--- a/harbour/doc/dirstruc.txt
+++ b/harbour/doc/dirstruc.txt
@@ -38,50 +38,6 @@ track of all files (read the FAQ if you don't know what SVN is).
 +---contrib             - Miscellaneous contribution files. Those are not
 |   |                     part of the official Harbour project.
 |   |
-|   +---examples        - Sample files and small applications.
-|   |   |
-|   |   +---dbu         - Make files (without source) for CA-Cl*pper DBU.
-|   |   |
-|   |   +---guestbk     - Harbour Guests Book.
-|   |   |
-|   |   +---hbsqlit2    - Interface for SQLite 2.x library.
-|   |   |   |
-|   |   |   +---tests   - Test programs.
-|   |   |
-|   |   +---hscript     - Harbour Script.
-|   |   |
-|   |   +---misc        - A few humble demonstration.
-|   |   |
-|   |   +---pe          - Editor.
-|   |   |
-|   |   +---pp          - Harbour Preprocessor as a standalone module.
-|   |   |
-|   |   +---rdddbt      - DBFDBT RDD.
-|   |   |
-|   |   +---rl          - Make files (without source) for CA-Cl*pper RL.
-|   |   |
-|   |   +---terminal    - Harbour terminal server/client.
-|   |   |
-|   |   +---uhttpd      - uHTTPD micro web server.
-|   |       |
-|   |       +-home      - Root directory for the web server.
-|   |       | |
-|   |       | +-cgi-bin - (*)
-|   |       | |
-|   |       | +-css     -
-|   |       | |
-|   |       | +-images  -
-|   |       | |
-|   |       | +-js      -
-|   |       | |
-|   |       | +-xsl     -
-|   |       |
-|   |       +-logs      - Log files. (*)
-|   |       |
-|   |       +-modules   -
-|   |       |
-|   |       +-sessions  - (*)
-|   |
 |   |---gtalleg         - GT subsystem based on Allegro with graphic
 |   |                     extensions.
 |   |
@@ -266,6 +222,50 @@ track of all files (read the FAQ if you don't know what SVN is).
 |       |
 |       +---tests       - Test programs.
 |
++---examples        - Sample files and small applications.
+|   |
+|   +---dbu         - Make files (without source) for CA-Cl*pper DBU.
+|   |
+|   +---guestbk     - Harbour Guests Book.
+|   |
+|   +---hbsqlit2    - Interface for SQLite 2.x library.
+|   |   |
+|   |   +---tests   - Test programs.
+|   |
+|   +---hscript     - Harbour Script.
+|   |
+|   +---misc        - A few humble demonstration.
+|   |
+|   +---pe          - Editor.
+|   |
+|   +---pp          - Harbour Preprocessor as a standalone module.
+|   |
+|   +---rdddbt      - DBFDBT RDD.
+|   |
+|   +---rl          - Make files (without source) for CA-Cl*pper RL.
+|   |
+|   +---terminal    - Harbour terminal server/client.
+|   |
+|   +---uhttpd      - uHTTPD micro web server.
+|       |
+|       +-home      - Root directory for the web server.
+|       | |
+|       | +-cgi-bin - (*)
+|       | |
+|       | +-css     -
+|       | |
+|       | +-images  -
+|       | |
+|       | +-js      -
+|       | |
+|       | +-xsl     -
+|       |
+|       +-logs      - Log files. (*)
+|       |
+|       +-modules   -
+|       |
+|       +-sessions  - (*)
+|
 +---debian              - Packaging information for Debian GNU/Linux.
 |
 +---doc                 - Documentation and white-paper.
diff --git a/harbour/doc/man/hbmk.1 b/harbour/doc/man/hbmk.1
index 28f5c54a92..7f5c27f881 100644
--- a/harbour/doc/man/hbmk.1
+++ b/harbour/doc/man/hbmk.1
@@ -70,8 +70,8 @@ show commands executed
 .IP "\fB-[no]run\fP" 10
 run/don't run the created executable
 
-.IP "\fB-nohbp\fP" 10
-do not process .hbp files in current directory
+.IP "\fB-nohbc\fP" 10
+do not process .hbc files in current directory
 
 .IP "\fB-hbcc, -hbcmp\fP" 10
 stop after creating the object files
@@ -94,7 +94,7 @@ turn on informational messages
 .IP "\fB-quiet\fP" 10
 suppress all screen messages
 
-<script> can be <@script> (.hbm file), <script.hbm> or <script.hbp>.
+<script> can be <@script> (.hbm file), <script.hbm> or <script.hbc>.
 
 Regular Harbour compiler options are also accepted.
 
@@ -103,17 +103,17 @@ Multiple -l, -L and <script> parameters are accepted.
 hbmk.cfg option file in hbmk directory is always processed if it exists.
 On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour,
 <base>/etc are checked (in that order) before the hbmk directory.
-The file format is the same as .hbp.
+The file format is the same as .hbc.
 
-.hbp option files in current dir are automatically processed.
+.hbc option files in current dir are automatically processed.
 
-.hbp options (they should come in separate lines):
+.hbc options (they should come in separate lines):
 libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags]
 cflags=[C compiler flags], ldflags=[Linker flags], libpaths=[lib paths]
 gui|mt|shared|nulrdd|debug|map|strip|run=[yes|no]
 Lines starting with '#' char are ignored
 
-Platform filters are accepted in each .hbp line and with -l options.
+Platform filters are accepted in each .hbc line and with -l options.
 Filter format: {[!][<arch|comp>]}. Filters can be combined
 using '&', '|' operators and grouped by parantheses.
 Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!owatcom}
diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt
index f93a3aa4b8..27c6855001 100644
--- a/harbour/doc/whatsnew.txt
+++ b/harbour/doc/whatsnew.txt
@@ -386,7 +386,7 @@ Contrib
   with the same name.
 - hbhpdf fixed HPDF_SETINFODATEATTR() function.
 - Added experimental terminal server written in Harbour. Find it
-  in contrib/examples.
+  in /examples.
 - hbgt now properly checks for package version and includes
   feature accordingly.
 - hbwin added WAPI_GETCOMMANDLINE(), WIN_GETCOMMANDLINEPARAM(),
diff --git a/harbour/contrib/examples/Makefile b/harbour/examples/Makefile
similarity index 89%
rename from harbour/contrib/examples/Makefile
rename to harbour/examples/Makefile
index 3409050588..dc5b9131f5 100644
--- a/harbour/contrib/examples/Makefile
+++ b/harbour/examples/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../
+ROOT = ../
 
 DIRS=\
 	guestbk \
diff --git a/harbour/contrib/examples/dbu/Makefile b/harbour/examples/dbu/Makefile
similarity index 94%
rename from harbour/contrib/examples/dbu/Makefile
rename to harbour/examples/dbu/Makefile
index 96e5108c36..8abe533e0d 100644
--- a/harbour/contrib/examples/dbu/Makefile
+++ b/harbour/examples/dbu/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 PRG_SOURCES=\
 	DBU.PRG \
@@ -14,7 +14,7 @@ PRG_SOURCES=\
 	DBUSTRU.PRG \
 	DBUUTIL.PRG \
 	DBUVIEW.PRG \
-	
+
 PRG_MAIN=DBU.PRG
 
 LIBS=\
diff --git a/harbour/contrib/examples/dbu/dbu.dif b/harbour/examples/dbu/dbu.dif
similarity index 100%
rename from harbour/contrib/examples/dbu/dbu.dif
rename to harbour/examples/dbu/dbu.dif
diff --git a/harbour/contrib/examples/dbu/dbu.hbm b/harbour/examples/dbu/dbu.hbm
similarity index 100%
rename from harbour/contrib/examples/dbu/dbu.hbm
rename to harbour/examples/dbu/dbu.hbm
diff --git a/harbour/contrib/examples/dbu/readme.txt b/harbour/examples/dbu/readme.txt
similarity index 100%
rename from harbour/contrib/examples/dbu/readme.txt
rename to harbour/examples/dbu/readme.txt
diff --git a/harbour/contrib/examples/guestbk/Makefile b/harbour/examples/guestbk/Makefile
similarity index 93%
rename from harbour/contrib/examples/guestbk/Makefile
rename to harbour/examples/guestbk/Makefile
index f01115b1fb..96998638ed 100644
--- a/harbour/contrib/examples/guestbk/Makefile
+++ b/harbour/examples/guestbk/Makefile
@@ -2,13 +2,13 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 PRG_SOURCES=\
 	guestbk.prg \
 	inifiles.prg \
 	testcgi.prg \
-	
+
 PRG_MAIN=guestbk.prg
 
 LIBS=\
diff --git a/harbour/contrib/examples/guestbk/cgi.ch b/harbour/examples/guestbk/cgi.ch
similarity index 100%
rename from harbour/contrib/examples/guestbk/cgi.ch
rename to harbour/examples/guestbk/cgi.ch
diff --git a/harbour/contrib/examples/guestbk/guestbk.hbm b/harbour/examples/guestbk/guestbk.hbm
similarity index 100%
rename from harbour/contrib/examples/guestbk/guestbk.hbm
rename to harbour/examples/guestbk/guestbk.hbm
diff --git a/harbour/contrib/examples/guestbk/guestbk.htm b/harbour/examples/guestbk/guestbk.htm
similarity index 100%
rename from harbour/contrib/examples/guestbk/guestbk.htm
rename to harbour/examples/guestbk/guestbk.htm
diff --git a/harbour/contrib/examples/guestbk/guestbk.ini b/harbour/examples/guestbk/guestbk.ini
similarity index 100%
rename from harbour/contrib/examples/guestbk/guestbk.ini
rename to harbour/examples/guestbk/guestbk.ini
diff --git a/harbour/contrib/examples/guestbk/guestbk.prg b/harbour/examples/guestbk/guestbk.prg
similarity index 100%
rename from harbour/contrib/examples/guestbk/guestbk.prg
rename to harbour/examples/guestbk/guestbk.prg
diff --git a/harbour/contrib/examples/guestbk/guestbk.txt b/harbour/examples/guestbk/guestbk.txt
similarity index 100%
rename from harbour/contrib/examples/guestbk/guestbk.txt
rename to harbour/examples/guestbk/guestbk.txt
diff --git a/harbour/contrib/examples/guestbk/inifiles.prg b/harbour/examples/guestbk/inifiles.prg
similarity index 100%
rename from harbour/contrib/examples/guestbk/inifiles.prg
rename to harbour/examples/guestbk/inifiles.prg
diff --git a/harbour/contrib/examples/guestbk/testcgi.prg b/harbour/examples/guestbk/testcgi.prg
similarity index 100%
rename from harbour/contrib/examples/guestbk/testcgi.prg
rename to harbour/examples/guestbk/testcgi.prg
diff --git a/harbour/contrib/examples/hbapollo/ChangeLog b/harbour/examples/hbapollo/ChangeLog
similarity index 100%
rename from harbour/contrib/examples/hbapollo/ChangeLog
rename to harbour/examples/hbapollo/ChangeLog
diff --git a/harbour/contrib/examples/hbapollo/Makefile b/harbour/examples/hbapollo/Makefile
similarity index 97%
rename from harbour/contrib/examples/hbapollo/Makefile
rename to harbour/examples/hbapollo/Makefile
index f05867dc19..55090288a1 100644
--- a/harbour/contrib/examples/hbapollo/Makefile
+++ b/harbour/examples/hbapollo/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 LIBNAME=hbapollo
 
diff --git a/harbour/contrib/examples/hbapollo/apollo.c b/harbour/examples/hbapollo/apollo.c
similarity index 100%
rename from harbour/contrib/examples/hbapollo/apollo.c
rename to harbour/examples/hbapollo/apollo.c
diff --git a/harbour/contrib/examples/hbapollo/apollo.ch b/harbour/examples/hbapollo/apollo.ch
similarity index 100%
rename from harbour/contrib/examples/hbapollo/apollo.ch
rename to harbour/examples/hbapollo/apollo.ch
diff --git a/harbour/contrib/examples/hbapollo/apollo1.prg b/harbour/examples/hbapollo/apollo1.prg
similarity index 100%
rename from harbour/contrib/examples/hbapollo/apollo1.prg
rename to harbour/examples/hbapollo/apollo1.prg
diff --git a/harbour/contrib/examples/hbapollo/readme.txt b/harbour/examples/hbapollo/readme.txt
similarity index 100%
rename from harbour/contrib/examples/hbapollo/readme.txt
rename to harbour/examples/hbapollo/readme.txt
diff --git a/harbour/contrib/examples/hbapollo/tests/apollo.prg b/harbour/examples/hbapollo/tests/apollo.prg
similarity index 100%
rename from harbour/contrib/examples/hbapollo/tests/apollo.prg
rename to harbour/examples/hbapollo/tests/apollo.prg
diff --git a/harbour/contrib/examples/hbapollo/tests/hbapollo.hbc b/harbour/examples/hbapollo/tests/hbapollo.hbc
similarity index 100%
rename from harbour/contrib/examples/hbapollo/tests/hbapollo.hbc
rename to harbour/examples/hbapollo/tests/hbapollo.hbc
diff --git a/harbour/contrib/examples/hbdoc/Makefile b/harbour/examples/hbdoc/Makefile
similarity index 95%
rename from harbour/contrib/examples/hbdoc/Makefile
rename to harbour/examples/hbdoc/Makefile
index c0a38ed03e..78ea2e670e 100644
--- a/harbour/contrib/examples/hbdoc/Makefile
+++ b/harbour/examples/hbdoc/Makefile
@@ -6,7 +6,7 @@ ifeq ($(HB_MAIN),)
 HB_MAIN = std
 endif
 
-ROOT = ../../../
+ROOT = ../../
 
 PRG_SOURCES=\
 	hbdoc.prg \
diff --git a/harbour/contrib/examples/hbdoc/examples/core_en/genhtm.bat b/harbour/examples/hbdoc/examples/core_en/genhtm.bat
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_en/genhtm.bat
rename to harbour/examples/hbdoc/examples/core_en/genhtm.bat
diff --git a/harbour/contrib/examples/hbdoc/examples/core_en/genhtm.lnk b/harbour/examples/hbdoc/examples/core_en/genhtm.lnk
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_en/genhtm.lnk
rename to harbour/examples/hbdoc/examples/core_en/genhtm.lnk
diff --git a/harbour/contrib/examples/hbdoc/examples/core_en/genhtm.rsp b/harbour/examples/hbdoc/examples/core_en/genhtm.rsp
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_en/genhtm.rsp
rename to harbour/examples/hbdoc/examples/core_en/genhtm.rsp
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/Makefile b/harbour/examples/hbdoc/examples/core_es/Makefile
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/Makefile
rename to harbour/examples/hbdoc/examples/core_es/Makefile
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/array.txt b/harbour/examples/hbdoc/examples/core_es/array.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/array.txt
rename to harbour/examples/hbdoc/examples/core_es/array.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/binnum.txt b/harbour/examples/hbdoc/examples/core_es/binnum.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/binnum.txt
rename to harbour/examples/hbdoc/examples/core_es/binnum.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/browse.txt b/harbour/examples/hbdoc/examples/core_es/browse.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/browse.txt
rename to harbour/examples/hbdoc/examples/core_es/browse.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/clipper.txt b/harbour/examples/hbdoc/examples/core_es/clipper.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/clipper.txt
rename to harbour/examples/hbdoc/examples/core_es/clipper.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/cmdline.txt b/harbour/examples/hbdoc/examples/core_es/cmdline.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/cmdline.txt
rename to harbour/examples/hbdoc/examples/core_es/cmdline.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/codebloc.txt b/harbour/examples/hbdoc/examples/core_es/codebloc.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/codebloc.txt
rename to harbour/examples/hbdoc/examples/core_es/codebloc.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/codestyl.txt b/harbour/examples/hbdoc/examples/core_es/codestyl.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/codestyl.txt
rename to harbour/examples/hbdoc/examples/core_es/codestyl.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/command.txt b/harbour/examples/hbdoc/examples/core_es/command.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/command.txt
rename to harbour/examples/hbdoc/examples/core_es/command.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/compiler.txt b/harbour/examples/hbdoc/examples/core_es/compiler.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/compiler.txt
rename to harbour/examples/hbdoc/examples/core_es/compiler.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/datetime.txt b/harbour/examples/hbdoc/examples/core_es/datetime.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/datetime.txt
rename to harbour/examples/hbdoc/examples/core_es/datetime.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/dbdelim.txt b/harbour/examples/hbdoc/examples/core_es/dbdelim.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/dbdelim.txt
rename to harbour/examples/hbdoc/examples/core_es/dbdelim.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/dbsdf.txt b/harbour/examples/hbdoc/examples/core_es/dbsdf.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/dbsdf.txt
rename to harbour/examples/hbdoc/examples/core_es/dbsdf.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/dbstrux.txt b/harbour/examples/hbdoc/examples/core_es/dbstrux.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/dbstrux.txt
rename to harbour/examples/hbdoc/examples/core_es/dbstrux.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/dir.txt b/harbour/examples/hbdoc/examples/core_es/dir.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/dir.txt
rename to harbour/examples/hbdoc/examples/core_es/dir.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/dirstruc.txt b/harbour/examples/hbdoc/examples/core_es/dirstruc.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/dirstruc.txt
rename to harbour/examples/hbdoc/examples/core_es/dirstruc.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/diskspac.txt b/harbour/examples/hbdoc/examples/core_es/diskspac.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/diskspac.txt
rename to harbour/examples/hbdoc/examples/core_es/diskspac.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/errsys.txt b/harbour/examples/hbdoc/examples/core_es/errsys.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/errsys.txt
rename to harbour/examples/hbdoc/examples/core_es/errsys.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/eval.txt b/harbour/examples/hbdoc/examples/core_es/eval.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/eval.txt
rename to harbour/examples/hbdoc/examples/core_es/eval.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/file.txt b/harbour/examples/hbdoc/examples/core_es/file.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/file.txt
rename to harbour/examples/hbdoc/examples/core_es/file.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/garbage.txt b/harbour/examples/hbdoc/examples/core_es/garbage.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/garbage.txt
rename to harbour/examples/hbdoc/examples/core_es/garbage.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/gnulice.txt b/harbour/examples/hbdoc/examples/core_es/gnulice.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/gnulice.txt
rename to harbour/examples/hbdoc/examples/core_es/gnulice.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/harbext.txt b/harbour/examples/hbdoc/examples/core_es/harbext.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/harbext.txt
rename to harbour/examples/hbdoc/examples/core_es/harbext.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/hb_apiln.txt b/harbour/examples/hbdoc/examples/core_es/hb_apiln.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/hb_apiln.txt
rename to harbour/examples/hbdoc/examples/core_es/hb_apiln.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/hb_set.txt b/harbour/examples/hbdoc/examples/core_es/hb_set.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/hb_set.txt
rename to harbour/examples/hbdoc/examples/core_es/hb_set.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/hb_vm.txt b/harbour/examples/hbdoc/examples/core_es/hb_vm.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/hb_vm.txt
rename to harbour/examples/hbdoc/examples/core_es/hb_vm.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/howtobsd.txt b/harbour/examples/hbdoc/examples/core_es/howtobsd.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/howtobsd.txt
rename to harbour/examples/hbdoc/examples/core_es/howtobsd.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/hvm.txt b/harbour/examples/hbdoc/examples/core_es/hvm.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/hvm.txt
rename to harbour/examples/hbdoc/examples/core_es/hvm.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/idle.txt b/harbour/examples/hbdoc/examples/core_es/idle.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/idle.txt
rename to harbour/examples/hbdoc/examples/core_es/idle.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/input.txt b/harbour/examples/hbdoc/examples/core_es/input.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/input.txt
rename to harbour/examples/hbdoc/examples/core_es/input.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/lang.txt b/harbour/examples/hbdoc/examples/core_es/lang.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/lang.txt
rename to harbour/examples/hbdoc/examples/core_es/lang.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/license.txt b/harbour/examples/hbdoc/examples/core_es/license.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/license.txt
rename to harbour/examples/hbdoc/examples/core_es/license.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/macro.txt b/harbour/examples/hbdoc/examples/core_es/macro.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/macro.txt
rename to harbour/examples/hbdoc/examples/core_es/macro.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/math.txt b/harbour/examples/hbdoc/examples/core_es/math.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/math.txt
rename to harbour/examples/hbdoc/examples/core_es/math.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/memo.txt b/harbour/examples/hbdoc/examples/core_es/memo.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/memo.txt
rename to harbour/examples/hbdoc/examples/core_es/memo.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/memvar2.txt b/harbour/examples/hbdoc/examples/core_es/memvar2.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/memvar2.txt
rename to harbour/examples/hbdoc/examples/core_es/memvar2.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/misc.txt b/harbour/examples/hbdoc/examples/core_es/misc.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/misc.txt
rename to harbour/examples/hbdoc/examples/core_es/misc.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/nation.txt b/harbour/examples/hbdoc/examples/core_es/nation.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/nation.txt
rename to harbour/examples/hbdoc/examples/core_es/nation.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/objfunc.txt b/harbour/examples/hbdoc/examples/core_es/objfunc.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/objfunc.txt
rename to harbour/examples/hbdoc/examples/core_es/objfunc.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/pcode.txt b/harbour/examples/hbdoc/examples/core_es/pcode.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/pcode.txt
rename to harbour/examples/hbdoc/examples/core_es/pcode.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/pragma.txt b/harbour/examples/hbdoc/examples/core_es/pragma.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/pragma.txt
rename to harbour/examples/hbdoc/examples/core_es/pragma.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/rdd.txt b/harbour/examples/hbdoc/examples/core_es/rdd.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/rdd.txt
rename to harbour/examples/hbdoc/examples/core_es/rdd.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/readme.txt b/harbour/examples/hbdoc/examples/core_es/readme.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/readme.txt
rename to harbour/examples/hbdoc/examples/core_es/readme.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/sayget.txt b/harbour/examples/hbdoc/examples/core_es/sayget.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/sayget.txt
rename to harbour/examples/hbdoc/examples/core_es/sayget.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/setmode.txt b/harbour/examples/hbdoc/examples/core_es/setmode.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/setmode.txt
rename to harbour/examples/hbdoc/examples/core_es/setmode.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/statics.txt b/harbour/examples/hbdoc/examples/core_es/statics.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/statics.txt
rename to harbour/examples/hbdoc/examples/core_es/statics.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/strotype.txt b/harbour/examples/hbdoc/examples/core_es/strotype.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/strotype.txt
rename to harbour/examples/hbdoc/examples/core_es/strotype.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/subcodes.txt b/harbour/examples/hbdoc/examples/core_es/subcodes.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/subcodes.txt
rename to harbour/examples/hbdoc/examples/core_es/subcodes.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/tbrowse.txt b/harbour/examples/hbdoc/examples/core_es/tbrowse.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/tbrowse.txt
rename to harbour/examples/hbdoc/examples/core_es/tbrowse.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/tclass.txt b/harbour/examples/hbdoc/examples/core_es/tclass.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/tclass.txt
rename to harbour/examples/hbdoc/examples/core_es/tclass.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/tgetlist.txt b/harbour/examples/hbdoc/examples/core_es/tgetlist.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/tgetlist.txt
rename to harbour/examples/hbdoc/examples/core_es/tgetlist.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/tlabel.txt b/harbour/examples/hbdoc/examples/core_es/tlabel.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/tlabel.txt
rename to harbour/examples/hbdoc/examples/core_es/tlabel.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/tracing.txt b/harbour/examples/hbdoc/examples/core_es/tracing.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/tracing.txt
rename to harbour/examples/hbdoc/examples/core_es/tracing.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/treport.txt b/harbour/examples/hbdoc/examples/core_es/treport.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/treport.txt
rename to harbour/examples/hbdoc/examples/core_es/treport.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/var.txt b/harbour/examples/hbdoc/examples/core_es/var.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/var.txt
rename to harbour/examples/hbdoc/examples/core_es/var.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/core_es/vm.txt b/harbour/examples/hbdoc/examples/core_es/vm.txt
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/core_es/vm.txt
rename to harbour/examples/hbdoc/examples/core_es/vm.txt
diff --git a/harbour/contrib/examples/hbdoc/examples/hbmisc/gendoc.bat b/harbour/examples/hbdoc/examples/hbmisc/gendoc.bat
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/hbmisc/gendoc.bat
rename to harbour/examples/hbdoc/examples/hbmisc/gendoc.bat
diff --git a/harbour/contrib/examples/hbdoc/examples/hbmisc/hbmisc.lnk b/harbour/examples/hbdoc/examples/hbmisc/hbmisc.lnk
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/hbmisc/hbmisc.lnk
rename to harbour/examples/hbdoc/examples/hbmisc/hbmisc.lnk
diff --git a/harbour/contrib/examples/hbdoc/examples/hbmisc/hbmisc.rsp b/harbour/examples/hbdoc/examples/hbmisc/hbmisc.rsp
similarity index 100%
rename from harbour/contrib/examples/hbdoc/examples/hbmisc/hbmisc.rsp
rename to harbour/examples/hbdoc/examples/hbmisc/hbmisc.rsp
diff --git a/harbour/contrib/examples/hbdoc/ft_funcs.prg b/harbour/examples/hbdoc/ft_funcs.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/ft_funcs.prg
rename to harbour/examples/hbdoc/ft_funcs.prg
diff --git a/harbour/contrib/examples/hbdoc/genasc.prg b/harbour/examples/hbdoc/genasc.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/genasc.prg
rename to harbour/examples/hbdoc/genasc.prg
diff --git a/harbour/contrib/examples/hbdoc/genchm.prg b/harbour/examples/hbdoc/genchm.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/genchm.prg
rename to harbour/examples/hbdoc/genchm.prg
diff --git a/harbour/contrib/examples/hbdoc/genhpc.prg b/harbour/examples/hbdoc/genhpc.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/genhpc.prg
rename to harbour/examples/hbdoc/genhpc.prg
diff --git a/harbour/contrib/examples/hbdoc/genhtm.prg b/harbour/examples/hbdoc/genhtm.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/genhtm.prg
rename to harbour/examples/hbdoc/genhtm.prg
diff --git a/harbour/contrib/examples/hbdoc/genng.prg b/harbour/examples/hbdoc/genng.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/genng.prg
rename to harbour/examples/hbdoc/genng.prg
diff --git a/harbour/contrib/examples/hbdoc/genos2.prg b/harbour/examples/hbdoc/genos2.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/genos2.prg
rename to harbour/examples/hbdoc/genos2.prg
diff --git a/harbour/contrib/examples/hbdoc/genpdf1.prg b/harbour/examples/hbdoc/genpdf1.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/genpdf1.prg
rename to harbour/examples/hbdoc/genpdf1.prg
diff --git a/harbour/contrib/examples/hbdoc/genrtf.prg b/harbour/examples/hbdoc/genrtf.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/genrtf.prg
rename to harbour/examples/hbdoc/genrtf.prg
diff --git a/harbour/contrib/examples/hbdoc/gentrf.prg b/harbour/examples/hbdoc/gentrf.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/gentrf.prg
rename to harbour/examples/hbdoc/gentrf.prg
diff --git a/harbour/contrib/examples/hbdoc/hbdfrdln.c b/harbour/examples/hbdoc/hbdfrdln.c
similarity index 100%
rename from harbour/contrib/examples/hbdoc/hbdfrdln.c
rename to harbour/examples/hbdoc/hbdfrdln.c
diff --git a/harbour/contrib/examples/hbdoc/hbdoc.1 b/harbour/examples/hbdoc/hbdoc.1
similarity index 100%
rename from harbour/contrib/examples/hbdoc/hbdoc.1
rename to harbour/examples/hbdoc/hbdoc.1
diff --git a/harbour/contrib/examples/hbdoc/hbdoc.hbm b/harbour/examples/hbdoc/hbdoc.hbm
similarity index 100%
rename from harbour/contrib/examples/hbdoc/hbdoc.hbm
rename to harbour/examples/hbdoc/hbdoc.hbm
diff --git a/harbour/contrib/examples/hbdoc/hbdoc.prg b/harbour/examples/hbdoc/hbdoc.prg
similarity index 100%
rename from harbour/contrib/examples/hbdoc/hbdoc.prg
rename to harbour/examples/hbdoc/hbdoc.prg
diff --git a/harbour/contrib/examples/hbdoc/hbdocdef.ch b/harbour/examples/hbdoc/hbdocdef.ch
similarity index 100%
rename from harbour/contrib/examples/hbdoc/hbdocdef.ch
rename to harbour/examples/hbdoc/hbdocdef.ch
diff --git a/harbour/contrib/examples/hbgf/Makefile b/harbour/examples/hbgf/Makefile
similarity index 93%
rename from harbour/contrib/examples/hbgf/Makefile
rename to harbour/examples/hbgf/Makefile
index 1b0e000f09..45fe1687f0 100644
--- a/harbour/contrib/examples/hbgf/Makefile
+++ b/harbour/examples/hbgf/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 ifeq ($(HB_ARCHITECTURE),win)
 DIRS = hbgfwin
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/Makefile b/harbour/examples/hbgf/hbgfgtk/Makefile
similarity index 97%
rename from harbour/contrib/examples/hbgf/hbgfgtk/Makefile
rename to harbour/examples/hbgf/hbgfgtk/Makefile
index d8e9dfca7a..9f2a95850c 100644
--- a/harbour/contrib/examples/hbgf/hbgfgtk/Makefile
+++ b/harbour/examples/hbgf/hbgfgtk/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../../
+ROOT = ../../../
 
 LIBNAME=hbgfgtk
 
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/button.prg b/harbour/examples/hbgf/hbgfgtk/button.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/button.prg
rename to harbour/examples/hbgf/hbgfgtk/button.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/creabutt.c b/harbour/examples/hbgf/hbgfgtk/creabutt.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/creabutt.c
rename to harbour/examples/hbgf/hbgfgtk/creabutt.c
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/creamenu.c b/harbour/examples/hbgf/hbgfgtk/creamenu.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/creamenu.c
rename to harbour/examples/hbgf/hbgfgtk/creamenu.c
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/creawin.c b/harbour/examples/hbgf/hbgfgtk/creawin.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/creawin.c
rename to harbour/examples/hbgf/hbgfgtk/creawin.c
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/dispatch.c b/harbour/examples/hbgf/hbgfgtk/dispatch.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/dispatch.c
rename to harbour/examples/hbgf/hbgfgtk/dispatch.c
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/form.prg b/harbour/examples/hbgf/hbgfgtk/form.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/form.prg
rename to harbour/examples/hbgf/hbgfgtk/form.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/general.c b/harbour/examples/hbgf/hbgfgtk/general.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/general.c
rename to harbour/examples/hbgf/hbgfgtk/general.c
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/harbgtk.ch b/harbour/examples/hbgf/hbgfgtk/harbgtk.ch
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/harbgtk.ch
rename to harbour/examples/hbgf/hbgfgtk/harbgtk.ch
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/harbgtk.h b/harbour/examples/hbgf/hbgfgtk/harbgtk.h
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/harbgtk.h
rename to harbour/examples/hbgf/hbgfgtk/harbgtk.h
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/mainlgtk.c b/harbour/examples/hbgf/hbgfgtk/mainlgtk.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/mainlgtk.c
rename to harbour/examples/hbgf/hbgfgtk/mainlgtk.c
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/menu.prg b/harbour/examples/hbgf/hbgfgtk/menu.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/menu.prg
rename to harbour/examples/hbgf/hbgfgtk/menu.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/menuitem.prg b/harbour/examples/hbgf/hbgfgtk/menuitem.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/menuitem.prg
rename to harbour/examples/hbgf/hbgfgtk/menuitem.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/msginfo.c b/harbour/examples/hbgf/hbgfgtk/msginfo.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/msginfo.c
rename to harbour/examples/hbgf/hbgfgtk/msginfo.c
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/shared.ch b/harbour/examples/hbgf/hbgfgtk/shared.ch
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/shared.ch
rename to harbour/examples/hbgf/hbgfgtk/shared.ch
diff --git a/harbour/contrib/examples/hbgf/hbgfgtk/winctrl.prg b/harbour/examples/hbgf/hbgfgtk/winctrl.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfgtk/winctrl.prg
rename to harbour/examples/hbgf/hbgfgtk/winctrl.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/Makefile b/harbour/examples/hbgf/hbgfos2/Makefile
similarity index 92%
rename from harbour/contrib/examples/hbgf/hbgfos2/Makefile
rename to harbour/examples/hbgf/hbgfos2/Makefile
index add4e4eb77..dbcd7c61fe 100644
--- a/harbour/contrib/examples/hbgf/hbgfos2/Makefile
+++ b/harbour/examples/hbgf/hbgfos2/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../../
+ROOT = ../../../
 
 LIBNAME=hbgfos2
 
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/button.prg b/harbour/examples/hbgf/hbgfos2/button.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfos2/button.prg
rename to harbour/examples/hbgf/hbgfos2/button.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/edit.prg b/harbour/examples/hbgf/hbgfos2/edit.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfos2/edit.prg
rename to harbour/examples/hbgf/hbgfos2/edit.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/os2pm.c b/harbour/examples/hbgf/hbgfos2/os2pm.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfos2/os2pm.c
rename to harbour/examples/hbgf/hbgfos2/os2pm.c
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/os2pm.ch b/harbour/examples/hbgf/hbgfos2/os2pm.ch
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfos2/os2pm.ch
rename to harbour/examples/hbgf/hbgfos2/os2pm.ch
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/tform.prg b/harbour/examples/hbgf/hbgfos2/tform.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfos2/tform.prg
rename to harbour/examples/hbgf/hbgfos2/tform.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/tmenu.prg b/harbour/examples/hbgf/hbgfos2/tmenu.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfos2/tmenu.prg
rename to harbour/examples/hbgf/hbgfos2/tmenu.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/tmenuit.prg b/harbour/examples/hbgf/hbgfos2/tmenuit.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfos2/tmenuit.prg
rename to harbour/examples/hbgf/hbgfos2/tmenuit.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfos2/winctrl.prg b/harbour/examples/hbgf/hbgfos2/winctrl.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfos2/winctrl.prg
rename to harbour/examples/hbgf/hbgfos2/winctrl.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/Makefile b/harbour/examples/hbgf/hbgfwin/Makefile
similarity index 92%
rename from harbour/contrib/examples/hbgf/hbgfwin/Makefile
rename to harbour/examples/hbgf/hbgfwin/Makefile
index d6a995fc0c..523eed1264 100644
--- a/harbour/contrib/examples/hbgf/hbgfwin/Makefile
+++ b/harbour/examples/hbgf/hbgfwin/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../../
+ROOT = ../../../
 
 LIBNAME=hbgfwin
 
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/button.prg b/harbour/examples/hbgf/hbgfwin/button.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfwin/button.prg
rename to harbour/examples/hbgf/hbgfwin/button.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/edit.prg b/harbour/examples/hbgf/hbgfwin/edit.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfwin/edit.prg
rename to harbour/examples/hbgf/hbgfwin/edit.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/form.prg b/harbour/examples/hbgf/hbgfwin/form.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfwin/form.prg
rename to harbour/examples/hbgf/hbgfwin/form.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/hbgfwin.ch b/harbour/examples/hbgf/hbgfwin/hbgfwin.ch
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfwin/hbgfwin.ch
rename to harbour/examples/hbgf/hbgfwin/hbgfwin.ch
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/menu.prg b/harbour/examples/hbgf/hbgfwin/menu.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfwin/menu.prg
rename to harbour/examples/hbgf/hbgfwin/menu.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/menuitem.prg b/harbour/examples/hbgf/hbgfwin/menuitem.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfwin/menuitem.prg
rename to harbour/examples/hbgf/hbgfwin/menuitem.prg
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/winapi.c b/harbour/examples/hbgf/hbgfwin/winapi.c
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfwin/winapi.c
rename to harbour/examples/hbgf/hbgfwin/winapi.c
diff --git a/harbour/contrib/examples/hbgf/hbgfwin/winctrl.prg b/harbour/examples/hbgf/hbgfwin/winctrl.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/hbgfwin/winctrl.prg
rename to harbour/examples/hbgf/hbgfwin/winctrl.prg
diff --git a/harbour/contrib/examples/hbgf/tests/form2.prg b/harbour/examples/hbgf/tests/form2.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/tests/form2.prg
rename to harbour/examples/hbgf/tests/form2.prg
diff --git a/harbour/contrib/examples/hbgf/tests/form3.hbf b/harbour/examples/hbgf/tests/form3.hbf
similarity index 100%
rename from harbour/contrib/examples/hbgf/tests/form3.hbf
rename to harbour/examples/hbgf/tests/form3.hbf
diff --git a/harbour/contrib/examples/hbgf/tests/form3.prg b/harbour/examples/hbgf/tests/form3.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/tests/form3.prg
rename to harbour/examples/hbgf/tests/form3.prg
diff --git a/harbour/contrib/examples/hbgf/tests/form3res.prg b/harbour/examples/hbgf/tests/form3res.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/tests/form3res.prg
rename to harbour/examples/hbgf/tests/form3res.prg
diff --git a/harbour/contrib/examples/hbgf/tests/formtext.prg b/harbour/examples/hbgf/tests/formtext.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/tests/formtext.prg
rename to harbour/examples/hbgf/tests/formtext.prg
diff --git a/harbour/contrib/examples/hbgf/tests/hbgf.hbc b/harbour/examples/hbgf/tests/hbgf.hbc
similarity index 100%
rename from harbour/contrib/examples/hbgf/tests/hbgf.hbc
rename to harbour/examples/hbgf/tests/hbgf.hbc
diff --git a/harbour/contrib/examples/hbgf/tests/testctrl.prg b/harbour/examples/hbgf/tests/testctrl.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/tests/testctrl.prg
rename to harbour/examples/hbgf/tests/testctrl.prg
diff --git a/harbour/contrib/examples/hbgf/tests/testform.prg b/harbour/examples/hbgf/tests/testform.prg
similarity index 100%
rename from harbour/contrib/examples/hbgf/tests/testform.prg
rename to harbour/examples/hbgf/tests/testform.prg
diff --git a/harbour/contrib/examples/hboleold/Makefile b/harbour/examples/hboleold/Makefile
similarity index 94%
rename from harbour/contrib/examples/hboleold/Makefile
rename to harbour/examples/hboleold/Makefile
index aae940d0d6..d37bd79a9a 100644
--- a/harbour/contrib/examples/hboleold/Makefile
+++ b/harbour/examples/hboleold/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 LIBNAME=hboleold
 
diff --git a/harbour/contrib/examples/hboleold/tests/testole.prg b/harbour/examples/hboleold/tests/testole.prg
similarity index 100%
rename from harbour/contrib/examples/hboleold/tests/testole.prg
rename to harbour/examples/hboleold/tests/testole.prg
diff --git a/harbour/contrib/examples/hboleold/win_ole.c b/harbour/examples/hboleold/win_ole.c
similarity index 100%
rename from harbour/contrib/examples/hboleold/win_ole.c
rename to harbour/examples/hboleold/win_ole.c
diff --git a/harbour/contrib/examples/hboleold/win_tole.prg b/harbour/examples/hboleold/win_tole.prg
similarity index 100%
rename from harbour/contrib/examples/hboleold/win_tole.prg
rename to harbour/examples/hboleold/win_tole.prg
diff --git a/harbour/contrib/examples/hbsqlit2/Makefile b/harbour/examples/hbsqlit2/Makefile
similarity index 94%
rename from harbour/contrib/examples/hbsqlit2/Makefile
rename to harbour/examples/hbsqlit2/Makefile
index d023dee5e4..fd62de37c9 100644
--- a/harbour/contrib/examples/hbsqlit2/Makefile
+++ b/harbour/examples/hbsqlit2/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 LIBNAME=hbsqlit2
 
diff --git a/harbour/contrib/examples/hbsqlit2/TODO.txt b/harbour/examples/hbsqlit2/TODO.txt
similarity index 100%
rename from harbour/contrib/examples/hbsqlit2/TODO.txt
rename to harbour/examples/hbsqlit2/TODO.txt
diff --git a/harbour/contrib/examples/hbsqlit2/hbsqlit2.c b/harbour/examples/hbsqlit2/hbsqlit2.c
similarity index 100%
rename from harbour/contrib/examples/hbsqlit2/hbsqlit2.c
rename to harbour/examples/hbsqlit2/hbsqlit2.c
diff --git a/harbour/contrib/examples/hbsqlit2/hbsqlit2.ch b/harbour/examples/hbsqlit2/hbsqlit2.ch
similarity index 100%
rename from harbour/contrib/examples/hbsqlit2/hbsqlit2.ch
rename to harbour/examples/hbsqlit2/hbsqlit2.ch
diff --git a/harbour/contrib/examples/hbsqlit2/readme.txt b/harbour/examples/hbsqlit2/readme.txt
similarity index 100%
rename from harbour/contrib/examples/hbsqlit2/readme.txt
rename to harbour/examples/hbsqlit2/readme.txt
diff --git a/harbour/contrib/examples/hbsqlit2/tests/example.db b/harbour/examples/hbsqlit2/tests/example.db
similarity index 100%
rename from harbour/contrib/examples/hbsqlit2/tests/example.db
rename to harbour/examples/hbsqlit2/tests/example.db
diff --git a/harbour/contrib/examples/hbsqlit2/tests/hbsqlit2.hbc b/harbour/examples/hbsqlit2/tests/hbsqlit2.hbc
similarity index 100%
rename from harbour/contrib/examples/hbsqlit2/tests/hbsqlit2.hbc
rename to harbour/examples/hbsqlit2/tests/hbsqlit2.hbc
diff --git a/harbour/contrib/examples/hbsqlit2/tests/hbsqlite.prg b/harbour/examples/hbsqlit2/tests/hbsqlite.prg
similarity index 100%
rename from harbour/contrib/examples/hbsqlit2/tests/hbsqlite.prg
rename to harbour/examples/hbsqlit2/tests/hbsqlite.prg
diff --git a/harbour/contrib/examples/hbsuper/hbsuper.dif b/harbour/examples/hbsuper/hbsuper.dif
similarity index 100%
rename from harbour/contrib/examples/hbsuper/hbsuper.dif
rename to harbour/examples/hbsuper/hbsuper.dif
diff --git a/harbour/contrib/examples/hbsuper/hbsuper.hbm b/harbour/examples/hbsuper/hbsuper.hbm
similarity index 100%
rename from harbour/contrib/examples/hbsuper/hbsuper.hbm
rename to harbour/examples/hbsuper/hbsuper.hbm
diff --git a/harbour/contrib/examples/hbsuper/hbsuper.prg b/harbour/examples/hbsuper/hbsuper.prg
similarity index 100%
rename from harbour/contrib/examples/hbsuper/hbsuper.prg
rename to harbour/examples/hbsuper/hbsuper.prg
diff --git a/harbour/contrib/examples/hbsuper/readme.txt b/harbour/examples/hbsuper/readme.txt
similarity index 100%
rename from harbour/contrib/examples/hbsuper/readme.txt
rename to harbour/examples/hbsuper/readme.txt
diff --git a/harbour/contrib/examples/hbwhat/Makefile b/harbour/examples/hbwhat/Makefile
similarity index 98%
rename from harbour/contrib/examples/hbwhat/Makefile
rename to harbour/examples/hbwhat/Makefile
index ff115be6ba..0131fddc49 100644
--- a/harbour/contrib/examples/hbwhat/Makefile
+++ b/harbour/examples/hbwhat/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 LIBNAME=hbwhat
 
diff --git a/harbour/contrib/examples/hbwhat/commctrl.ch b/harbour/examples/hbwhat/commctrl.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/commctrl.ch
rename to harbour/examples/hbwhat/commctrl.ch
diff --git a/harbour/contrib/examples/hbwhat/commdlg.ch b/harbour/examples/hbwhat/commdlg.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/commdlg.ch
rename to harbour/examples/hbwhat/commdlg.ch
diff --git a/harbour/contrib/examples/hbwhat/debug.ch b/harbour/examples/hbwhat/debug.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/debug.ch
rename to harbour/examples/hbwhat/debug.ch
diff --git a/harbour/contrib/examples/hbwhat/hbwhat.ch b/harbour/examples/hbwhat/hbwhat.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/hbwhat.ch
rename to harbour/examples/hbwhat/hbwhat.ch
diff --git a/harbour/contrib/examples/hbwhat/hbwhat.h b/harbour/examples/hbwhat/hbwhat.h
similarity index 100%
rename from harbour/contrib/examples/hbwhat/hbwhat.h
rename to harbour/examples/hbwhat/hbwhat.h
diff --git a/harbour/contrib/examples/hbwhat/import.ch b/harbour/examples/hbwhat/import.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/import.ch
rename to harbour/examples/hbwhat/import.ch
diff --git a/harbour/contrib/examples/hbwhat/sqltypes.ch b/harbour/examples/hbwhat/sqltypes.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/sqltypes.ch
rename to harbour/examples/hbwhat/sqltypes.ch
diff --git a/harbour/contrib/examples/hbwhat/tests/hbwhat.hbc b/harbour/examples/hbwhat/tests/hbwhat.hbc
similarity index 100%
rename from harbour/contrib/examples/hbwhat/tests/hbwhat.hbc
rename to harbour/examples/hbwhat/tests/hbwhat.hbc
diff --git a/harbour/contrib/examples/hbwhat/tests/whatdemo.prg b/harbour/examples/hbwhat/tests/whatdemo.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/tests/whatdemo.prg
rename to harbour/examples/hbwhat/tests/whatdemo.prg
diff --git a/harbour/contrib/examples/hbwhat/whatutil.prg b/harbour/examples/hbwhat/whatutil.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whatutil.prg
rename to harbour/examples/hbwhat/whatutil.prg
diff --git a/harbour/contrib/examples/hbwhat/whtbmp.c b/harbour/examples/hbwhat/whtbmp.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtbmp.c
rename to harbour/examples/hbwhat/whtbmp.c
diff --git a/harbour/contrib/examples/hbwhat/whtbrsh.c b/harbour/examples/hbwhat/whtbrsh.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtbrsh.c
rename to harbour/examples/hbwhat/whtbrsh.c
diff --git a/harbour/contrib/examples/hbwhat/whtcdlg.c b/harbour/examples/hbwhat/whtcdlg.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtcdlg.c
rename to harbour/examples/hbwhat/whtcdlg.c
diff --git a/harbour/contrib/examples/hbwhat/whtclpb.c b/harbour/examples/hbwhat/whtclpb.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtclpb.c
rename to harbour/examples/hbwhat/whtclpb.c
diff --git a/harbour/contrib/examples/hbwhat/whtcomm.c b/harbour/examples/hbwhat/whtcomm.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtcomm.c
rename to harbour/examples/hbwhat/whtcomm.c
diff --git a/harbour/contrib/examples/hbwhat/whtcret.c b/harbour/examples/hbwhat/whtcret.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtcret.c
rename to harbour/examples/hbwhat/whtcret.c
diff --git a/harbour/contrib/examples/hbwhat/whtdate.c b/harbour/examples/hbwhat/whtdate.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtdate.c
rename to harbour/examples/hbwhat/whtdate.c
diff --git a/harbour/contrib/examples/hbwhat/whtdc.c b/harbour/examples/hbwhat/whtdc.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtdc.c
rename to harbour/examples/hbwhat/whtdc.c
diff --git a/harbour/contrib/examples/hbwhat/whtdir.c b/harbour/examples/hbwhat/whtdir.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtdir.c
rename to harbour/examples/hbwhat/whtdir.c
diff --git a/harbour/contrib/examples/hbwhat/whtdlg.c b/harbour/examples/hbwhat/whtdlg.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtdlg.c
rename to harbour/examples/hbwhat/whtdlg.c
diff --git a/harbour/contrib/examples/hbwhat/whtdraw.c b/harbour/examples/hbwhat/whtdraw.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtdraw.c
rename to harbour/examples/hbwhat/whtdraw.c
diff --git a/harbour/contrib/examples/hbwhat/whtfont.c b/harbour/examples/hbwhat/whtfont.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtfont.c
rename to harbour/examples/hbwhat/whtfont.c
diff --git a/harbour/contrib/examples/hbwhat/whtgdi.c b/harbour/examples/hbwhat/whtgdi.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtgdi.c
rename to harbour/examples/hbwhat/whtgdi.c
diff --git a/harbour/contrib/examples/hbwhat/whthead.c b/harbour/examples/hbwhat/whthead.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whthead.c
rename to harbour/examples/hbwhat/whthead.c
diff --git a/harbour/contrib/examples/hbwhat/whticon.c b/harbour/examples/hbwhat/whticon.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whticon.c
rename to harbour/examples/hbwhat/whticon.c
diff --git a/harbour/contrib/examples/hbwhat/whtilst.c b/harbour/examples/hbwhat/whtilst.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtilst.c
rename to harbour/examples/hbwhat/whtilst.c
diff --git a/harbour/contrib/examples/hbwhat/whtinet.c b/harbour/examples/hbwhat/whtinet.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtinet.c
rename to harbour/examples/hbwhat/whtinet.c
diff --git a/harbour/contrib/examples/hbwhat/whtini.c b/harbour/examples/hbwhat/whtini.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtini.c
rename to harbour/examples/hbwhat/whtini.c
diff --git a/harbour/contrib/examples/hbwhat/whtkbrd.c b/harbour/examples/hbwhat/whtkbrd.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtkbrd.c
rename to harbour/examples/hbwhat/whtkbrd.c
diff --git a/harbour/contrib/examples/hbwhat/whtlv.c b/harbour/examples/hbwhat/whtlv.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtlv.c
rename to harbour/examples/hbwhat/whtlv.c
diff --git a/harbour/contrib/examples/hbwhat/whtmain.c b/harbour/examples/hbwhat/whtmain.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmain.c
rename to harbour/examples/hbwhat/whtmain.c
diff --git a/harbour/contrib/examples/hbwhat/whtmapi.c b/harbour/examples/hbwhat/whtmapi.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmapi.c
rename to harbour/examples/hbwhat/whtmapi.c
diff --git a/harbour/contrib/examples/hbwhat/whtmem.c b/harbour/examples/hbwhat/whtmem.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmem.c
rename to harbour/examples/hbwhat/whtmem.c
diff --git a/harbour/contrib/examples/hbwhat/whtmenu.c b/harbour/examples/hbwhat/whtmenu.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmenu.c
rename to harbour/examples/hbwhat/whtmenu.c
diff --git a/harbour/contrib/examples/hbwhat/whtmeta.c b/harbour/examples/hbwhat/whtmeta.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmeta.c
rename to harbour/examples/hbwhat/whtmeta.c
diff --git a/harbour/contrib/examples/hbwhat/whtmisc.c b/harbour/examples/hbwhat/whtmisc.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmisc.c
rename to harbour/examples/hbwhat/whtmisc.c
diff --git a/harbour/contrib/examples/hbwhat/whtmmcap.c b/harbour/examples/hbwhat/whtmmcap.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmmcap.c
rename to harbour/examples/hbwhat/whtmmcap.c
diff --git a/harbour/contrib/examples/hbwhat/whtmous.c b/harbour/examples/hbwhat/whtmous.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmous.c
rename to harbour/examples/hbwhat/whtmous.c
diff --git a/harbour/contrib/examples/hbwhat/whtmsg.c b/harbour/examples/hbwhat/whtmsg.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtmsg.c
rename to harbour/examples/hbwhat/whtmsg.c
diff --git a/harbour/contrib/examples/hbwhat/whtpen.c b/harbour/examples/hbwhat/whtpen.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtpen.c
rename to harbour/examples/hbwhat/whtpen.c
diff --git a/harbour/contrib/examples/hbwhat/whtprn.c b/harbour/examples/hbwhat/whtprn.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtprn.c
rename to harbour/examples/hbwhat/whtprn.c
diff --git a/harbour/contrib/examples/hbwhat/whtrect.c b/harbour/examples/hbwhat/whtrect.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtrect.c
rename to harbour/examples/hbwhat/whtrect.c
diff --git a/harbour/contrib/examples/hbwhat/whtreg.c b/harbour/examples/hbwhat/whtreg.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtreg.c
rename to harbour/examples/hbwhat/whtreg.c
diff --git a/harbour/contrib/examples/hbwhat/whtrgn.c b/harbour/examples/hbwhat/whtrgn.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtrgn.c
rename to harbour/examples/hbwhat/whtrgn.c
diff --git a/harbour/contrib/examples/hbwhat/whtscrlb.c b/harbour/examples/hbwhat/whtscrlb.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtscrlb.c
rename to harbour/examples/hbwhat/whtscrlb.c
diff --git a/harbour/contrib/examples/hbwhat/whtseria.c b/harbour/examples/hbwhat/whtseria.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtseria.c
rename to harbour/examples/hbwhat/whtseria.c
diff --git a/harbour/contrib/examples/hbwhat/whtshell.c b/harbour/examples/hbwhat/whtshell.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtshell.c
rename to harbour/examples/hbwhat/whtshell.c
diff --git a/harbour/contrib/examples/hbwhat/whtsock.c b/harbour/examples/hbwhat/whtsock.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtsock.c
rename to harbour/examples/hbwhat/whtsock.c
diff --git a/harbour/contrib/examples/hbwhat/whtsys.c b/harbour/examples/hbwhat/whtsys.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtsys.c
rename to harbour/examples/hbwhat/whtsys.c
diff --git a/harbour/contrib/examples/hbwhat/whttab.c b/harbour/examples/hbwhat/whttab.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whttab.c
rename to harbour/examples/hbwhat/whttab.c
diff --git a/harbour/contrib/examples/hbwhat/whttbar.c b/harbour/examples/hbwhat/whttbar.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whttbar.c
rename to harbour/examples/hbwhat/whttbar.c
diff --git a/harbour/contrib/examples/hbwhat/whttext.c b/harbour/examples/hbwhat/whttext.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whttext.c
rename to harbour/examples/hbwhat/whttext.c
diff --git a/harbour/contrib/examples/hbwhat/whttree.c b/harbour/examples/hbwhat/whttree.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whttree.c
rename to harbour/examples/hbwhat/whttree.c
diff --git a/harbour/contrib/examples/hbwhat/whtview.c b/harbour/examples/hbwhat/whtview.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtview.c
rename to harbour/examples/hbwhat/whtview.c
diff --git a/harbour/contrib/examples/hbwhat/whtwnd.c b/harbour/examples/hbwhat/whtwnd.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/whtwnd.c
rename to harbour/examples/hbwhat/whtwnd.c
diff --git a/harbour/contrib/examples/hbwhat/wincdlg.prg b/harbour/examples/hbwhat/wincdlg.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/wincdlg.prg
rename to harbour/examples/hbwhat/wincdlg.prg
diff --git a/harbour/contrib/examples/hbwhat/wincomm.prg b/harbour/examples/hbwhat/wincomm.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/wincomm.prg
rename to harbour/examples/hbwhat/wincomm.prg
diff --git a/harbour/contrib/examples/hbwhat/wincore.prg b/harbour/examples/hbwhat/wincore.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/wincore.prg
rename to harbour/examples/hbwhat/wincore.prg
diff --git a/harbour/contrib/examples/hbwhat/wincorec.c b/harbour/examples/hbwhat/wincorec.c
similarity index 100%
rename from harbour/contrib/examples/hbwhat/wincorec.c
rename to harbour/examples/hbwhat/wincorec.c
diff --git a/harbour/contrib/examples/hbwhat/windebug.prg b/harbour/examples/hbwhat/windebug.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/windebug.prg
rename to harbour/examples/hbwhat/windebug.prg
diff --git a/harbour/contrib/examples/hbwhat/winerror.prg b/harbour/examples/hbwhat/winerror.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/winerror.prg
rename to harbour/examples/hbwhat/winerror.prg
diff --git a/harbour/contrib/examples/hbwhat/wingdi.ch b/harbour/examples/hbwhat/wingdi.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/wingdi.ch
rename to harbour/examples/hbwhat/wingdi.ch
diff --git a/harbour/contrib/examples/hbwhat/wininet.ch b/harbour/examples/hbwhat/wininet.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/wininet.ch
rename to harbour/examples/hbwhat/wininet.ch
diff --git a/harbour/contrib/examples/hbwhat/winini.prg b/harbour/examples/hbwhat/winini.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/winini.prg
rename to harbour/examples/hbwhat/winini.prg
diff --git a/harbour/contrib/examples/hbwhat/winrbar.prg b/harbour/examples/hbwhat/winrbar.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/winrbar.prg
rename to harbour/examples/hbwhat/winrbar.prg
diff --git a/harbour/contrib/examples/hbwhat/winstruc.ch b/harbour/examples/hbwhat/winstruc.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/winstruc.ch
rename to harbour/examples/hbwhat/winstruc.ch
diff --git a/harbour/contrib/examples/hbwhat/wintabs.prg b/harbour/examples/hbwhat/wintabs.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/wintabs.prg
rename to harbour/examples/hbwhat/wintabs.prg
diff --git a/harbour/contrib/examples/hbwhat/wintbar.prg b/harbour/examples/hbwhat/wintbar.prg
similarity index 100%
rename from harbour/contrib/examples/hbwhat/wintbar.prg
rename to harbour/examples/hbwhat/wintbar.prg
diff --git a/harbour/contrib/examples/hbwhat/winuser.ch b/harbour/examples/hbwhat/winuser.ch
similarity index 100%
rename from harbour/contrib/examples/hbwhat/winuser.ch
rename to harbour/examples/hbwhat/winuser.ch
diff --git a/harbour/contrib/examples/hscript/Makefile b/harbour/examples/hscript/Makefile
similarity index 92%
rename from harbour/contrib/examples/hscript/Makefile
rename to harbour/examples/hscript/Makefile
index 873fb0faca..98b19efd90 100644
--- a/harbour/contrib/examples/hscript/Makefile
+++ b/harbour/examples/hscript/Makefile
@@ -2,11 +2,11 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 PRG_SOURCES=\
 	hscript.prg \
-	
+
 PRG_MAIN=hscript.prg
 
 LIBS=\
diff --git a/harbour/contrib/examples/hscript/cgi.ch b/harbour/examples/hscript/cgi.ch
similarity index 100%
rename from harbour/contrib/examples/hscript/cgi.ch
rename to harbour/examples/hscript/cgi.ch
diff --git a/harbour/contrib/examples/hscript/dir.hs b/harbour/examples/hscript/dir.hs
similarity index 100%
rename from harbour/contrib/examples/hscript/dir.hs
rename to harbour/examples/hscript/dir.hs
diff --git a/harbour/contrib/examples/hscript/hello.hs b/harbour/examples/hscript/hello.hs
similarity index 100%
rename from harbour/contrib/examples/hscript/hello.hs
rename to harbour/examples/hscript/hello.hs
diff --git a/harbour/contrib/examples/hscript/hscript.hbm b/harbour/examples/hscript/hscript.hbm
similarity index 100%
rename from harbour/contrib/examples/hscript/hscript.hbm
rename to harbour/examples/hscript/hscript.hbm
diff --git a/harbour/contrib/examples/hscript/hscript.prg b/harbour/examples/hscript/hscript.prg
similarity index 100%
rename from harbour/contrib/examples/hscript/hscript.prg
rename to harbour/examples/hscript/hscript.prg
diff --git a/harbour/contrib/examples/hscript/multiply.hs b/harbour/examples/hscript/multiply.hs
similarity index 100%
rename from harbour/contrib/examples/hscript/multiply.hs
rename to harbour/examples/hscript/multiply.hs
diff --git a/harbour/contrib/examples/hscript/readme.txt b/harbour/examples/hscript/readme.txt
similarity index 100%
rename from harbour/contrib/examples/hscript/readme.txt
rename to harbour/examples/hscript/readme.txt
diff --git a/harbour/contrib/examples/hscript/ugly.hs b/harbour/examples/hscript/ugly.hs
similarity index 100%
rename from harbour/contrib/examples/hscript/ugly.hs
rename to harbour/examples/hscript/ugly.hs
diff --git a/harbour/contrib/examples/misc/Makefile b/harbour/examples/misc/Makefile
similarity index 97%
rename from harbour/contrib/examples/misc/Makefile
rename to harbour/examples/misc/Makefile
index a63098b39e..4311952ba3 100644
--- a/harbour/contrib/examples/misc/Makefile
+++ b/harbour/examples/misc/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 LIBS=\
 	hbdebug \
diff --git a/harbour/contrib/examples/misc/guess.prg b/harbour/examples/misc/guess.prg
similarity index 100%
rename from harbour/contrib/examples/misc/guess.prg
rename to harbour/examples/misc/guess.prg
diff --git a/harbour/contrib/examples/misc/mankala.prg b/harbour/examples/misc/mankala.prg
similarity index 100%
rename from harbour/contrib/examples/misc/mankala.prg
rename to harbour/examples/misc/mankala.prg
diff --git a/harbour/contrib/examples/pe/Makefile b/harbour/examples/pe/Makefile
similarity index 93%
rename from harbour/contrib/examples/pe/Makefile
rename to harbour/examples/pe/Makefile
index e6b4856248..4f803a54f2 100644
--- a/harbour/contrib/examples/pe/Makefile
+++ b/harbour/examples/pe/Makefile
@@ -2,11 +2,11 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 PRG_SOURCES=\
 	editorhi.prg \
-	
+
 C_SOURCES=\
 	editorlo.c \
 
diff --git a/harbour/contrib/examples/pe/editorhi.prg b/harbour/examples/pe/editorhi.prg
similarity index 100%
rename from harbour/contrib/examples/pe/editorhi.prg
rename to harbour/examples/pe/editorhi.prg
diff --git a/harbour/contrib/examples/pe/editorlo.c b/harbour/examples/pe/editorlo.c
similarity index 100%
rename from harbour/contrib/examples/pe/editorlo.c
rename to harbour/examples/pe/editorlo.c
diff --git a/harbour/contrib/examples/pe/license.txt b/harbour/examples/pe/license.txt
similarity index 100%
rename from harbour/contrib/examples/pe/license.txt
rename to harbour/examples/pe/license.txt
diff --git a/harbour/contrib/examples/pe/pe.hbm b/harbour/examples/pe/pe.hbm
similarity index 100%
rename from harbour/contrib/examples/pe/pe.hbm
rename to harbour/examples/pe/pe.hbm
diff --git a/harbour/contrib/examples/pe/pe.prg b/harbour/examples/pe/pe.prg
similarity index 100%
rename from harbour/contrib/examples/pe/pe.prg
rename to harbour/examples/pe/pe.prg
diff --git a/harbour/contrib/examples/pe/readme.txt b/harbour/examples/pe/readme.txt
similarity index 100%
rename from harbour/contrib/examples/pe/readme.txt
rename to harbour/examples/pe/readme.txt
diff --git a/harbour/contrib/examples/pp/Makefile b/harbour/examples/pp/Makefile
similarity index 89%
rename from harbour/contrib/examples/pp/Makefile
rename to harbour/examples/pp/Makefile
index eec76c4195..82dfc9bcd5 100644
--- a/harbour/contrib/examples/pp/Makefile
+++ b/harbour/examples/pp/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 C_SOURCES=\
 	hbppcore.c \
diff --git a/harbour/contrib/examples/pp/hbppcomp.c b/harbour/examples/pp/hbppcomp.c
similarity index 100%
rename from harbour/contrib/examples/pp/hbppcomp.c
rename to harbour/examples/pp/hbppcomp.c
diff --git a/harbour/contrib/examples/pp/hbppcore.c b/harbour/examples/pp/hbppcore.c
similarity index 100%
rename from harbour/contrib/examples/pp/hbppcore.c
rename to harbour/examples/pp/hbppcore.c
diff --git a/harbour/contrib/examples/pp/hbppdef.h b/harbour/examples/pp/hbppdef.h
similarity index 100%
rename from harbour/contrib/examples/pp/hbppdef.h
rename to harbour/examples/pp/hbppdef.h
diff --git a/harbour/contrib/examples/pp/hbpptbl.c b/harbour/examples/pp/hbpptbl.c
similarity index 100%
rename from harbour/contrib/examples/pp/hbpptbl.c
rename to harbour/examples/pp/hbpptbl.c
diff --git a/harbour/contrib/examples/pp/hbpragma.c b/harbour/examples/pp/hbpragma.c
similarity index 100%
rename from harbour/contrib/examples/pp/hbpragma.c
rename to harbour/examples/pp/hbpragma.c
diff --git a/harbour/contrib/examples/pp/pp.c b/harbour/examples/pp/pp.c
similarity index 100%
rename from harbour/contrib/examples/pp/pp.c
rename to harbour/examples/pp/pp.c
diff --git a/harbour/contrib/examples/pp/pp.hbm b/harbour/examples/pp/pp.hbm
similarity index 100%
rename from harbour/contrib/examples/pp/pp.hbm
rename to harbour/examples/pp/pp.hbm
diff --git a/harbour/contrib/examples/rdddbt/Makefile b/harbour/examples/rdddbt/Makefile
similarity index 84%
rename from harbour/contrib/examples/rdddbt/Makefile
rename to harbour/examples/rdddbt/Makefile
index 0a6d0a05ac..68d5309176 100644
--- a/harbour/contrib/examples/rdddbt/Makefile
+++ b/harbour/examples/rdddbt/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 C_SOURCES=\
 	dbfdbt1.c \
diff --git a/harbour/contrib/examples/rdddbt/dbfdbt1.c b/harbour/examples/rdddbt/dbfdbt1.c
similarity index 100%
rename from harbour/contrib/examples/rdddbt/dbfdbt1.c
rename to harbour/examples/rdddbt/dbfdbt1.c
diff --git a/harbour/contrib/examples/rdddbt/hbrdddbt.h b/harbour/examples/rdddbt/hbrdddbt.h
similarity index 100%
rename from harbour/contrib/examples/rdddbt/hbrdddbt.h
rename to harbour/examples/rdddbt/hbrdddbt.h
diff --git a/harbour/contrib/examples/rl/Makefile b/harbour/examples/rl/Makefile
similarity index 93%
rename from harbour/contrib/examples/rl/Makefile
rename to harbour/examples/rl/Makefile
index 3f67dc8c04..a38cce057b 100644
--- a/harbour/contrib/examples/rl/Makefile
+++ b/harbour/examples/rl/Makefile
@@ -2,13 +2,13 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 PRG_SOURCES=\
 	RLBACK.PRG \
 	RLDIALG.PRG \
 	RLFRONT.PRG \
-	
+
 PRG_MAIN=RLFRONT.PRG
 
 LIBS=\
diff --git a/harbour/contrib/examples/rl/readme.txt b/harbour/examples/rl/readme.txt
similarity index 100%
rename from harbour/contrib/examples/rl/readme.txt
rename to harbour/examples/rl/readme.txt
diff --git a/harbour/contrib/examples/rl/rl.hbm b/harbour/examples/rl/rl.hbm
similarity index 100%
rename from harbour/contrib/examples/rl/rl.hbm
rename to harbour/examples/rl/rl.hbm
diff --git a/harbour/contrib/examples/terminal/readme.txt b/harbour/examples/terminal/readme.txt
similarity index 100%
rename from harbour/contrib/examples/terminal/readme.txt
rename to harbour/examples/terminal/readme.txt
diff --git a/harbour/contrib/examples/terminal/terminal.ch b/harbour/examples/terminal/terminal.ch
similarity index 100%
rename from harbour/contrib/examples/terminal/terminal.ch
rename to harbour/examples/terminal/terminal.ch
diff --git a/harbour/contrib/examples/terminal/terminal.hbc b/harbour/examples/terminal/terminal.hbc
similarity index 100%
rename from harbour/contrib/examples/terminal/terminal.hbc
rename to harbour/examples/terminal/terminal.hbc
diff --git a/harbour/contrib/examples/terminal/terminal.prg b/harbour/examples/terminal/terminal.prg
similarity index 100%
rename from harbour/contrib/examples/terminal/terminal.prg
rename to harbour/examples/terminal/terminal.prg
diff --git a/harbour/contrib/examples/terminal/trm_appn.hbm b/harbour/examples/terminal/trm_appn.hbm
similarity index 100%
rename from harbour/contrib/examples/terminal/trm_appn.hbm
rename to harbour/examples/terminal/trm_appn.hbm
diff --git a/harbour/contrib/examples/terminal/trm_appn.prg b/harbour/examples/terminal/trm_appn.prg
similarity index 100%
rename from harbour/contrib/examples/terminal/trm_appn.prg
rename to harbour/examples/terminal/trm_appn.prg
diff --git a/harbour/contrib/examples/terminal/trm_client.prg b/harbour/examples/terminal/trm_client.prg
similarity index 100%
rename from harbour/contrib/examples/terminal/trm_client.prg
rename to harbour/examples/terminal/trm_client.prg
diff --git a/harbour/contrib/examples/terminal/trm_server.prg b/harbour/examples/terminal/trm_server.prg
similarity index 100%
rename from harbour/contrib/examples/terminal/trm_server.prg
rename to harbour/examples/terminal/trm_server.prg
diff --git a/harbour/contrib/examples/uhttpd/cgifunc.prg b/harbour/examples/uhttpd/cgifunc.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/cgifunc.prg
rename to harbour/examples/uhttpd/cgifunc.prg
diff --git a/harbour/contrib/examples/uhttpd/cookie.prg b/harbour/examples/uhttpd/cookie.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/cookie.prg
rename to harbour/examples/uhttpd/cookie.prg
diff --git a/harbour/contrib/examples/uhttpd/home/counter.html b/harbour/examples/uhttpd/home/counter.html
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/counter.html
rename to harbour/examples/uhttpd/home/counter.html
diff --git a/harbour/contrib/examples/uhttpd/home/css/base.css b/harbour/examples/uhttpd/home/css/base.css
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/css/base.css
rename to harbour/examples/uhttpd/home/css/base.css
diff --git a/harbour/contrib/examples/uhttpd/home/favicon.ico b/harbour/examples/uhttpd/home/favicon.ico
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/favicon.ico
rename to harbour/examples/uhttpd/home/favicon.ico
diff --git a/harbour/contrib/examples/uhttpd/home/images/ajax-loader.gif b/harbour/examples/uhttpd/home/images/ajax-loader.gif
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/images/ajax-loader.gif
rename to harbour/examples/uhttpd/home/images/ajax-loader.gif
diff --git a/harbour/contrib/examples/uhttpd/home/index.html b/harbour/examples/uhttpd/home/index.html
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/index.html
rename to harbour/examples/uhttpd/home/index.html
diff --git a/harbour/contrib/examples/uhttpd/home/js/ajax.js b/harbour/examples/uhttpd/home/js/ajax.js
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/js/ajax.js
rename to harbour/examples/uhttpd/home/js/ajax.js
diff --git a/harbour/contrib/examples/uhttpd/home/postsample.html b/harbour/examples/uhttpd/home/postsample.html
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/postsample.html
rename to harbour/examples/uhttpd/home/postsample.html
diff --git a/harbour/contrib/examples/uhttpd/home/testajax.html b/harbour/examples/uhttpd/home/testajax.html
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/testajax.html
rename to harbour/examples/uhttpd/home/testajax.html
diff --git a/harbour/contrib/examples/uhttpd/home/testxmldb.html b/harbour/examples/uhttpd/home/testxmldb.html
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/testxmldb.html
rename to harbour/examples/uhttpd/home/testxmldb.html
diff --git a/harbour/contrib/examples/uhttpd/home/xsl/based.xsl b/harbour/examples/uhttpd/home/xsl/based.xsl
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/xsl/based.xsl
rename to harbour/examples/uhttpd/home/xsl/based.xsl
diff --git a/harbour/contrib/examples/uhttpd/home/xsl/basep.xsl b/harbour/examples/uhttpd/home/xsl/basep.xsl
similarity index 100%
rename from harbour/contrib/examples/uhttpd/home/xsl/basep.xsl
rename to harbour/examples/uhttpd/home/xsl/basep.xsl
diff --git a/harbour/contrib/examples/uhttpd/modules/allmod.hbm b/harbour/examples/uhttpd/modules/allmod.hbm
similarity index 100%
rename from harbour/contrib/examples/uhttpd/modules/allmod.hbm
rename to harbour/examples/uhttpd/modules/allmod.hbm
diff --git a/harbour/contrib/examples/uhttpd/modules/cookie.prg b/harbour/examples/uhttpd/modules/cookie.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/modules/cookie.prg
rename to harbour/examples/uhttpd/modules/cookie.prg
diff --git a/harbour/contrib/examples/uhttpd/modules/info.prg b/harbour/examples/uhttpd/modules/info.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/modules/info.prg
rename to harbour/examples/uhttpd/modules/info.prg
diff --git a/harbour/contrib/examples/uhttpd/modules/showcounter.prg b/harbour/examples/uhttpd/modules/showcounter.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/modules/showcounter.prg
rename to harbour/examples/uhttpd/modules/showcounter.prg
diff --git a/harbour/contrib/examples/uhttpd/modules/tableservletdb.prg b/harbour/examples/uhttpd/modules/tableservletdb.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/modules/tableservletdb.prg
rename to harbour/examples/uhttpd/modules/tableservletdb.prg
diff --git a/harbour/contrib/examples/uhttpd/modules/testajax.prg b/harbour/examples/uhttpd/modules/testajax.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/modules/testajax.prg
rename to harbour/examples/uhttpd/modules/testajax.prg
diff --git a/harbour/contrib/examples/uhttpd/readme.txt b/harbour/examples/uhttpd/readme.txt
similarity index 83%
rename from harbour/contrib/examples/uhttpd/readme.txt
rename to harbour/examples/uhttpd/readme.txt
index c17db61585..4c5eb58bde 100644
--- a/harbour/contrib/examples/uhttpd/readme.txt
+++ b/harbour/examples/uhttpd/readme.txt
@@ -4,8 +4,8 @@
 
 uHTTPD micro web server
 
-Build it without GD: ..\..\..\bin\hbmk uhttpd.hbm
-Build it with    GD: ..\..\..\bin\hbmk uhttpdgd.hbm
+Build it without GD: ..\..\bin\hbmk uhttpd.hbm
+Build it with    GD: ..\..\bin\hbmk uhttpdgd.hbm
   [ This one needs bgd.dll. Please download it from:
   http://www.libgd.org/releases/gd-latest-win32.zip ]
 
diff --git a/harbour/contrib/examples/uhttpd/session.prg b/harbour/examples/uhttpd/session.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/session.prg
rename to harbour/examples/uhttpd/session.prg
diff --git a/harbour/contrib/examples/uhttpd/socket.c b/harbour/examples/uhttpd/socket.c
similarity index 100%
rename from harbour/contrib/examples/uhttpd/socket.c
rename to harbour/examples/uhttpd/socket.c
diff --git a/harbour/contrib/examples/uhttpd/uhttpd.hbm b/harbour/examples/uhttpd/uhttpd.hbm
similarity index 100%
rename from harbour/contrib/examples/uhttpd/uhttpd.hbm
rename to harbour/examples/uhttpd/uhttpd.hbm
diff --git a/harbour/contrib/examples/uhttpd/uhttpd.ini b/harbour/examples/uhttpd/uhttpd.ini
similarity index 100%
rename from harbour/contrib/examples/uhttpd/uhttpd.ini
rename to harbour/examples/uhttpd/uhttpd.ini
diff --git a/harbour/contrib/examples/uhttpd/uhttpd.prg b/harbour/examples/uhttpd/uhttpd.prg
similarity index 100%
rename from harbour/contrib/examples/uhttpd/uhttpd.prg
rename to harbour/examples/uhttpd/uhttpd.prg
diff --git a/harbour/contrib/examples/uhttpd/uhttpdc.c b/harbour/examples/uhttpd/uhttpdc.c
similarity index 100%
rename from harbour/contrib/examples/uhttpd/uhttpdc.c
rename to harbour/examples/uhttpd/uhttpdc.c
diff --git a/harbour/contrib/examples/uhttpd/uhttpdgd.hbm b/harbour/examples/uhttpd/uhttpdgd.hbm
similarity index 100%
rename from harbour/contrib/examples/uhttpd/uhttpdgd.hbm
rename to harbour/examples/uhttpd/uhttpdgd.hbm
diff --git a/harbour/utils/hbmk2/examples/fwh.hbc b/harbour/utils/hbmk2/examples/fwh.hbc
index 18a06255d1..220a8b6c00 100644
--- a/harbour/utils/hbmk2/examples/fwh.hbc
+++ b/harbour/utils/hbmk2/examples/fwh.hbc
@@ -4,7 +4,7 @@
 
 # Copy this file to FWH root dir and include it in hbmk2
 # command line to build an app:
-# > hbmk2 test.prg C:\fwh\fwh.hbp
+# > hbmk2 test.prg C:\fwh\fwh.hbc
 
 {win}incpaths=${hb_self}include
 {win}libpaths=${hb_self}lib
diff --git a/harbour/utils/hbmk2/examples/hmg.hbc b/harbour/utils/hbmk2/examples/hmg.hbc
index 7756870111..53dd3c2446 100644
--- a/harbour/utils/hbmk2/examples/hmg.hbc
+++ b/harbour/utils/hbmk2/examples/hmg.hbc
@@ -4,7 +4,7 @@
 
 # Copy this file to hmg root dir and include it in hbmk2
 # command line to build an app:
-# > hbmk2 test.prg C:\hmg\hmg.hbp
+# > hbmk2 test.prg C:\hmg\hmg.hbc
 
 {win}incpaths=${hb_self}include
 {win}libpaths=${hb_self}lib ${hb_self}harbour\lib
diff --git a/harbour/utils/hbmk2/examples/hwgui.hbc b/harbour/utils/hbmk2/examples/hwgui.hbc
index a38bff0f3c..8cc7ad48ef 100644
--- a/harbour/utils/hbmk2/examples/hwgui.hbc
+++ b/harbour/utils/hbmk2/examples/hwgui.hbc
@@ -4,7 +4,7 @@
 
 # Copy this file to hwgui root dir and include it in hbmk2
 # command line to build an app:
-# > hbmk2 test.prg C:\hwgui\hwgui.hbp
+# > hbmk2 test.prg C:\hwgui\hwgui.hbc
 
 {win}incpaths=${hb_self}include
 {win}libpaths=${hb_self}lib