diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 85e8b53a72..17849c03ab 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-07-21 19:09 UTC+0200 Viktor Szakats (vszakats syenar.net)
+  + extras
+  - examples
+  * doc/dirstruc.txt
+    * renamed 'examples' to what it is more: 'extras'
+
 2012-07-21 18:31 UTC+0200 Viktor Szakats (vszakats syenar.net)
   + tests/stripeol.hb
     + added script to strip spaces at EOL
diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt
index 27bbd1d4d9..a16f9c0f79 100644
--- a/harbour/doc/dirstruc.txt
+++ b/harbour/doc/dirstruc.txt
@@ -91,7 +91,7 @@ track of all files (read the FAQ if you don't know what SVN is).
 |                         which where written using some xHarcour extensions,
 |                         to be complied by Harbour.
 |
-+---examples        - Sample files and small applications.
++---extras          - Sample files and small applications.
 |   |
 |   +---dbu         - Make files (without source) for CA-Cl*pper DBU.
 |   |
diff --git a/harbour/examples/commouse/commouse.prg b/harbour/extras/commouse/commouse.prg
similarity index 100%
rename from harbour/examples/commouse/commouse.prg
rename to harbour/extras/commouse/commouse.prg
diff --git a/harbour/examples/dbu/dbu.hbp b/harbour/extras/dbu/dbu.hbp
similarity index 100%
rename from harbour/examples/dbu/dbu.hbp
rename to harbour/extras/dbu/dbu.hbp
diff --git a/harbour/examples/dbu/dbu52.dif b/harbour/extras/dbu/dbu52.dif
similarity index 100%
rename from harbour/examples/dbu/dbu52.dif
rename to harbour/extras/dbu/dbu52.dif
diff --git a/harbour/examples/dbu/dbu53.dif b/harbour/extras/dbu/dbu53.dif
similarity index 100%
rename from harbour/examples/dbu/dbu53.dif
rename to harbour/extras/dbu/dbu53.dif
diff --git a/harbour/examples/dbu/readme.txt b/harbour/extras/dbu/readme.txt
similarity index 100%
rename from harbour/examples/dbu/readme.txt
rename to harbour/extras/dbu/readme.txt
diff --git a/harbour/examples/gfspell/gfspell.hbc b/harbour/extras/gfspell/gfspell.hbc
similarity index 100%
rename from harbour/examples/gfspell/gfspell.hbc
rename to harbour/extras/gfspell/gfspell.hbc
diff --git a/harbour/examples/gfspell/gfspell.hbp b/harbour/extras/gfspell/gfspell.hbp
similarity index 100%
rename from harbour/examples/gfspell/gfspell.hbp
rename to harbour/extras/gfspell/gfspell.hbp
diff --git a/harbour/examples/gfspell/readme.txt b/harbour/extras/gfspell/readme.txt
similarity index 100%
rename from harbour/examples/gfspell/readme.txt
rename to harbour/extras/gfspell/readme.txt
diff --git a/harbour/examples/gfspell/spell.ch b/harbour/extras/gfspell/spell.ch
similarity index 100%
rename from harbour/examples/gfspell/spell.ch
rename to harbour/extras/gfspell/spell.ch
diff --git a/harbour/examples/gfspell/spell.ng b/harbour/extras/gfspell/spell.ng
similarity index 100%
rename from harbour/examples/gfspell/spell.ng
rename to harbour/extras/gfspell/spell.ng
diff --git a/harbour/examples/gfspell/spell.prg b/harbour/extras/gfspell/spell.prg
similarity index 100%
rename from harbour/examples/gfspell/spell.prg
rename to harbour/extras/gfspell/spell.prg
diff --git a/harbour/examples/gfspell/spellc.c b/harbour/extras/gfspell/spellc.c
similarity index 100%
rename from harbour/examples/gfspell/spellc.c
rename to harbour/extras/gfspell/spellc.c
diff --git a/harbour/examples/gfspell/words.dbf b/harbour/extras/gfspell/words.dbf
similarity index 100%
rename from harbour/examples/gfspell/words.dbf
rename to harbour/extras/gfspell/words.dbf
diff --git a/harbour/examples/gtwvw/docs/funclist.txt b/harbour/extras/gtwvw/docs/funclist.txt
similarity index 100%
rename from harbour/examples/gtwvw/docs/funclist.txt
rename to harbour/extras/gtwvw/docs/funclist.txt
diff --git a/harbour/examples/gtwvw/docs/gtwvw.txt b/harbour/extras/gtwvw/docs/gtwvw.txt
similarity index 100%
rename from harbour/examples/gtwvw/docs/gtwvw.txt
rename to harbour/extras/gtwvw/docs/gtwvw.txt
diff --git a/harbour/examples/gtwvw/docs/whatsnew.txt b/harbour/extras/gtwvw/docs/whatsnew.txt
similarity index 100%
rename from harbour/examples/gtwvw/docs/whatsnew.txt
rename to harbour/extras/gtwvw/docs/whatsnew.txt
diff --git a/harbour/examples/gtwvw/gtwvw.c b/harbour/extras/gtwvw/gtwvw.c
similarity index 100%
rename from harbour/examples/gtwvw/gtwvw.c
rename to harbour/extras/gtwvw/gtwvw.c
diff --git a/harbour/examples/gtwvw/gtwvw.hbc b/harbour/extras/gtwvw/gtwvw.hbc
similarity index 100%
rename from harbour/examples/gtwvw/gtwvw.hbc
rename to harbour/extras/gtwvw/gtwvw.hbc
diff --git a/harbour/examples/gtwvw/gtwvw.hbp b/harbour/extras/gtwvw/gtwvw.hbp
similarity index 100%
rename from harbour/examples/gtwvw/gtwvw.hbp
rename to harbour/extras/gtwvw/gtwvw.hbp
diff --git a/harbour/examples/gtwvw/hbgtwvw.h b/harbour/extras/gtwvw/hbgtwvw.h
similarity index 100%
rename from harbour/examples/gtwvw/hbgtwvw.h
rename to harbour/extras/gtwvw/hbgtwvw.h
diff --git a/harbour/examples/gtwvw/hbole.h b/harbour/extras/gtwvw/hbole.h
similarity index 100%
rename from harbour/examples/gtwvw/hbole.h
rename to harbour/extras/gtwvw/hbole.h
diff --git a/harbour/examples/gtwvw/readme.txt b/harbour/extras/gtwvw/readme.txt
similarity index 100%
rename from harbour/examples/gtwvw/readme.txt
rename to harbour/extras/gtwvw/readme.txt
diff --git a/harbour/examples/gtwvw/tests/cbtest1.prg b/harbour/extras/gtwvw/tests/cbtest1.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/cbtest1.prg
rename to harbour/extras/gtwvw/tests/cbtest1.prg
diff --git a/harbour/examples/gtwvw/tests/cbtest6.prg b/harbour/extras/gtwvw/tests/cbtest6.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/cbtest6.prg
rename to harbour/extras/gtwvw/tests/cbtest6.prg
diff --git a/harbour/examples/gtwvw/tests/def2.bmp b/harbour/extras/gtwvw/tests/def2.bmp
similarity index 100%
rename from harbour/examples/gtwvw/tests/def2.bmp
rename to harbour/extras/gtwvw/tests/def2.bmp
diff --git a/harbour/examples/gtwvw/tests/dia_excl.ico b/harbour/extras/gtwvw/tests/dia_excl.ico
similarity index 100%
rename from harbour/examples/gtwvw/tests/dia_excl.ico
rename to harbour/extras/gtwvw/tests/dia_excl.ico
diff --git a/harbour/examples/gtwvw/tests/drawimg.prg b/harbour/extras/gtwvw/tests/drawimg.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/drawimg.prg
rename to harbour/extras/gtwvw/tests/drawimg.prg
diff --git a/harbour/examples/gtwvw/tests/ebtest7.prg b/harbour/extras/gtwvw/tests/ebtest7.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/ebtest7.prg
rename to harbour/extras/gtwvw/tests/ebtest7.prg
diff --git a/harbour/examples/gtwvw/tests/hbmk.hbm b/harbour/extras/gtwvw/tests/hbmk.hbm
similarity index 100%
rename from harbour/examples/gtwvw/tests/hbmk.hbm
rename to harbour/extras/gtwvw/tests/hbmk.hbm
diff --git a/harbour/examples/gtwvw/tests/inpfocus.prg b/harbour/extras/gtwvw/tests/inpfocus.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/inpfocus.prg
rename to harbour/extras/gtwvw/tests/inpfocus.prg
diff --git a/harbour/examples/gtwvw/tests/maincoor.prg b/harbour/extras/gtwvw/tests/maincoor.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/maincoor.prg
rename to harbour/extras/gtwvw/tests/maincoor.prg
diff --git a/harbour/examples/gtwvw/tests/maximize.prg b/harbour/extras/gtwvw/tests/maximize.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/maximize.prg
rename to harbour/extras/gtwvw/tests/maximize.prg
diff --git a/harbour/examples/gtwvw/tests/prog0.prg b/harbour/extras/gtwvw/tests/prog0.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/prog0.prg
rename to harbour/extras/gtwvw/tests/prog0.prg
diff --git a/harbour/examples/gtwvw/tests/prog1.prg b/harbour/extras/gtwvw/tests/prog1.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/prog1.prg
rename to harbour/extras/gtwvw/tests/prog1.prg
diff --git a/harbour/examples/gtwvw/tests/prog2.prg b/harbour/extras/gtwvw/tests/prog2.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/prog2.prg
rename to harbour/extras/gtwvw/tests/prog2.prg
diff --git a/harbour/examples/gtwvw/tests/readme.txt b/harbour/extras/gtwvw/tests/readme.txt
similarity index 100%
rename from harbour/examples/gtwvw/tests/readme.txt
rename to harbour/extras/gtwvw/tests/readme.txt
diff --git a/harbour/examples/gtwvw/tests/vouch1.bmp b/harbour/extras/gtwvw/tests/vouch1.bmp
similarity index 100%
rename from harbour/examples/gtwvw/tests/vouch1.bmp
rename to harbour/extras/gtwvw/tests/vouch1.bmp
diff --git a/harbour/examples/gtwvw/tests/vouch1.gif b/harbour/extras/gtwvw/tests/vouch1.gif
similarity index 100%
rename from harbour/examples/gtwvw/tests/vouch1.gif
rename to harbour/extras/gtwvw/tests/vouch1.gif
diff --git a/harbour/examples/gtwvw/tests/wvt2wvw.ch b/harbour/extras/gtwvw/tests/wvt2wvw.ch
similarity index 100%
rename from harbour/examples/gtwvw/tests/wvt2wvw.ch
rename to harbour/extras/gtwvw/tests/wvt2wvw.ch
diff --git a/harbour/examples/gtwvw/tests/wvwmouse.prg b/harbour/extras/gtwvw/tests/wvwmouse.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/wvwmouse.prg
rename to harbour/extras/gtwvw/tests/wvwmouse.prg
diff --git a/harbour/examples/gtwvw/tests/wvwtest9.hbp b/harbour/extras/gtwvw/tests/wvwtest9.hbp
similarity index 100%
rename from harbour/examples/gtwvw/tests/wvwtest9.hbp
rename to harbour/extras/gtwvw/tests/wvwtest9.hbp
diff --git a/harbour/examples/gtwvw/tests/wvwtest9.prg b/harbour/extras/gtwvw/tests/wvwtest9.prg
similarity index 100%
rename from harbour/examples/gtwvw/tests/wvwtest9.prg
rename to harbour/extras/gtwvw/tests/wvwtest9.prg
diff --git a/harbour/examples/gtwvw/tests/wvwtest9.rc b/harbour/extras/gtwvw/tests/wvwtest9.rc
similarity index 100%
rename from harbour/examples/gtwvw/tests/wvwtest9.rc
rename to harbour/extras/gtwvw/tests/wvwtest9.rc
diff --git a/harbour/examples/gtwvw/tests/wvwtest9.xml b/harbour/extras/gtwvw/tests/wvwtest9.xml
similarity index 100%
rename from harbour/examples/gtwvw/tests/wvwtest9.xml
rename to harbour/extras/gtwvw/tests/wvwtest9.xml
diff --git a/harbour/examples/gtwvw/wvwcheck.c b/harbour/extras/gtwvw/wvwcheck.c
similarity index 100%
rename from harbour/examples/gtwvw/wvwcheck.c
rename to harbour/extras/gtwvw/wvwcheck.c
diff --git a/harbour/examples/gtwvw/wvwdraw.c b/harbour/extras/gtwvw/wvwdraw.c
similarity index 100%
rename from harbour/examples/gtwvw/wvwdraw.c
rename to harbour/extras/gtwvw/wvwdraw.c
diff --git a/harbour/examples/gtwvw/wvwedit.c b/harbour/extras/gtwvw/wvwedit.c
similarity index 100%
rename from harbour/examples/gtwvw/wvwedit.c
rename to harbour/extras/gtwvw/wvwedit.c
diff --git a/harbour/examples/gtwvw/wvwfuncs.c b/harbour/extras/gtwvw/wvwfuncs.c
similarity index 100%
rename from harbour/examples/gtwvw/wvwfuncs.c
rename to harbour/extras/gtwvw/wvwfuncs.c
diff --git a/harbour/examples/gtwvw/wvwmenu.c b/harbour/extras/gtwvw/wvwmenu.c
similarity index 100%
rename from harbour/examples/gtwvw/wvwmenu.c
rename to harbour/extras/gtwvw/wvwmenu.c
diff --git a/harbour/examples/gtwvw/wvwpush.c b/harbour/extras/gtwvw/wvwpush.c
similarity index 100%
rename from harbour/examples/gtwvw/wvwpush.c
rename to harbour/extras/gtwvw/wvwpush.c
diff --git a/harbour/examples/gtwvw/wvwstbar.c b/harbour/extras/gtwvw/wvwstbar.c
similarity index 100%
rename from harbour/examples/gtwvw/wvwstbar.c
rename to harbour/extras/gtwvw/wvwstbar.c
diff --git a/harbour/examples/gtwvw/wvwtbar.c b/harbour/extras/gtwvw/wvwtbar.c
similarity index 100%
rename from harbour/examples/gtwvw/wvwtbar.c
rename to harbour/extras/gtwvw/wvwtbar.c
diff --git a/harbour/examples/guestbk/cgi.ch b/harbour/extras/guestbk/cgi.ch
similarity index 100%
rename from harbour/examples/guestbk/cgi.ch
rename to harbour/extras/guestbk/cgi.ch
diff --git a/harbour/examples/guestbk/guestbk.hbp b/harbour/extras/guestbk/guestbk.hbp
similarity index 100%
rename from harbour/examples/guestbk/guestbk.hbp
rename to harbour/extras/guestbk/guestbk.hbp
diff --git a/harbour/examples/guestbk/guestbk.htm b/harbour/extras/guestbk/guestbk.htm
similarity index 100%
rename from harbour/examples/guestbk/guestbk.htm
rename to harbour/extras/guestbk/guestbk.htm
diff --git a/harbour/examples/guestbk/guestbk.ini b/harbour/extras/guestbk/guestbk.ini
similarity index 100%
rename from harbour/examples/guestbk/guestbk.ini
rename to harbour/extras/guestbk/guestbk.ini
diff --git a/harbour/examples/guestbk/guestbk.prg b/harbour/extras/guestbk/guestbk.prg
similarity index 100%
rename from harbour/examples/guestbk/guestbk.prg
rename to harbour/extras/guestbk/guestbk.prg
diff --git a/harbour/examples/guestbk/guestbk.txt b/harbour/extras/guestbk/guestbk.txt
similarity index 100%
rename from harbour/examples/guestbk/guestbk.txt
rename to harbour/extras/guestbk/guestbk.txt
diff --git a/harbour/examples/guestbk/inifiles.prg b/harbour/extras/guestbk/inifiles.prg
similarity index 100%
rename from harbour/examples/guestbk/inifiles.prg
rename to harbour/extras/guestbk/inifiles.prg
diff --git a/harbour/examples/guestbk/testcgi.prg b/harbour/extras/guestbk/testcgi.prg
similarity index 100%
rename from harbour/examples/guestbk/testcgi.prg
rename to harbour/extras/guestbk/testcgi.prg
diff --git a/harbour/examples/hbapollo/alias.c b/harbour/extras/hbapollo/alias.c
similarity index 100%
rename from harbour/examples/hbapollo/alias.c
rename to harbour/extras/hbapollo/alias.c
diff --git a/harbour/examples/hbapollo/append.c b/harbour/extras/hbapollo/append.c
similarity index 100%
rename from harbour/examples/hbapollo/append.c
rename to harbour/extras/hbapollo/append.c
diff --git a/harbour/examples/hbapollo/array.prg b/harbour/extras/hbapollo/array.prg
similarity index 100%
rename from harbour/examples/hbapollo/array.prg
rename to harbour/extras/hbapollo/array.prg
diff --git a/harbour/examples/hbapollo/base.c b/harbour/extras/hbapollo/base.c
similarity index 100%
rename from harbour/examples/hbapollo/base.c
rename to harbour/extras/hbapollo/base.c
diff --git a/harbour/examples/hbapollo/bofeof.c b/harbour/extras/hbapollo/bofeof.c
similarity index 100%
rename from harbour/examples/hbapollo/bofeof.c
rename to harbour/extras/hbapollo/bofeof.c
diff --git a/harbour/examples/hbapollo/browdb.prg b/harbour/extras/hbapollo/browdb.prg
similarity index 100%
rename from harbour/examples/hbapollo/browdb.prg
rename to harbour/extras/hbapollo/browdb.prg
diff --git a/harbour/examples/hbapollo/browse.prg b/harbour/extras/hbapollo/browse.prg
similarity index 100%
rename from harbour/examples/hbapollo/browse.prg
rename to harbour/extras/hbapollo/browse.prg
diff --git a/harbour/examples/hbapollo/close.c b/harbour/extras/hbapollo/close.c
similarity index 100%
rename from harbour/examples/hbapollo/close.c
rename to harbour/extras/hbapollo/close.c
diff --git a/harbour/examples/hbapollo/commit.c b/harbour/extras/hbapollo/commit.c
similarity index 100%
rename from harbour/examples/hbapollo/commit.c
rename to harbour/extras/hbapollo/commit.c
diff --git a/harbour/examples/hbapollo/copy.c b/harbour/extras/hbapollo/copy.c
similarity index 100%
rename from harbour/examples/hbapollo/copy.c
rename to harbour/extras/hbapollo/copy.c
diff --git a/harbour/examples/hbapollo/count.c b/harbour/extras/hbapollo/count.c
similarity index 100%
rename from harbour/examples/hbapollo/count.c
rename to harbour/extras/hbapollo/count.c
diff --git a/harbour/examples/hbapollo/create.c b/harbour/extras/hbapollo/create.c
similarity index 100%
rename from harbour/examples/hbapollo/create.c
rename to harbour/extras/hbapollo/create.c
diff --git a/harbour/examples/hbapollo/dbcopy.c b/harbour/extras/hbapollo/dbcopy.c
similarity index 100%
rename from harbour/examples/hbapollo/dbcopy.c
rename to harbour/extras/hbapollo/dbcopy.c
diff --git a/harbour/examples/hbapollo/dbdelim.c b/harbour/extras/hbapollo/dbdelim.c
similarity index 100%
rename from harbour/examples/hbapollo/dbdelim.c
rename to harbour/extras/hbapollo/dbdelim.c
diff --git a/harbour/examples/hbapollo/dbedit.prg b/harbour/extras/hbapollo/dbedit.prg
similarity index 100%
rename from harbour/examples/hbapollo/dbedit.prg
rename to harbour/extras/hbapollo/dbedit.prg
diff --git a/harbour/examples/hbapollo/dbeval.c b/harbour/extras/hbapollo/dbeval.c
similarity index 100%
rename from harbour/examples/hbapollo/dbeval.c
rename to harbour/extras/hbapollo/dbeval.c
diff --git a/harbour/examples/hbapollo/dbsort.c b/harbour/extras/hbapollo/dbsort.c
similarity index 100%
rename from harbour/examples/hbapollo/dbsort.c
rename to harbour/extras/hbapollo/dbsort.c
diff --git a/harbour/examples/hbapollo/dbstru.c b/harbour/extras/hbapollo/dbstru.c
similarity index 100%
rename from harbour/examples/hbapollo/dbstru.c
rename to harbour/extras/hbapollo/dbstru.c
diff --git a/harbour/examples/hbapollo/decrypt.c b/harbour/extras/hbapollo/decrypt.c
similarity index 100%
rename from harbour/examples/hbapollo/decrypt.c
rename to harbour/extras/hbapollo/decrypt.c
diff --git a/harbour/examples/hbapollo/delete.c b/harbour/extras/hbapollo/delete.c
similarity index 100%
rename from harbour/examples/hbapollo/delete.c
rename to harbour/extras/hbapollo/delete.c
diff --git a/harbour/examples/hbapollo/descend.c b/harbour/extras/hbapollo/descend.c
similarity index 100%
rename from harbour/examples/hbapollo/descend.c
rename to harbour/extras/hbapollo/descend.c
diff --git a/harbour/examples/hbapollo/empty.c b/harbour/extras/hbapollo/empty.c
similarity index 100%
rename from harbour/examples/hbapollo/empty.c
rename to harbour/extras/hbapollo/empty.c
diff --git a/harbour/examples/hbapollo/encrypt.c b/harbour/extras/hbapollo/encrypt.c
similarity index 100%
rename from harbour/examples/hbapollo/encrypt.c
rename to harbour/extras/hbapollo/encrypt.c
diff --git a/harbour/examples/hbapollo/eval.c b/harbour/extras/hbapollo/eval.c
similarity index 100%
rename from harbour/examples/hbapollo/eval.c
rename to harbour/extras/hbapollo/eval.c
diff --git a/harbour/examples/hbapollo/fblock.prg b/harbour/extras/hbapollo/fblock.prg
similarity index 100%
rename from harbour/examples/hbapollo/fblock.prg
rename to harbour/extras/hbapollo/fblock.prg
diff --git a/harbour/examples/hbapollo/field.c b/harbour/extras/hbapollo/field.c
similarity index 100%
rename from harbour/examples/hbapollo/field.c
rename to harbour/extras/hbapollo/field.c
diff --git a/harbour/examples/hbapollo/filter.c b/harbour/extras/hbapollo/filter.c
similarity index 100%
rename from harbour/examples/hbapollo/filter.c
rename to harbour/extras/hbapollo/filter.c
diff --git a/harbour/examples/hbapollo/finalize.c b/harbour/extras/hbapollo/finalize.c
similarity index 100%
rename from harbour/examples/hbapollo/finalize.c
rename to harbour/extras/hbapollo/finalize.c
diff --git a/harbour/examples/hbapollo/get.c b/harbour/extras/hbapollo/get.c
similarity index 100%
rename from harbour/examples/hbapollo/get.c
rename to harbour/extras/hbapollo/get.c
diff --git a/harbour/examples/hbapollo/global.c b/harbour/extras/hbapollo/global.c
similarity index 100%
rename from harbour/examples/hbapollo/global.c
rename to harbour/extras/hbapollo/global.c
diff --git a/harbour/examples/hbapollo/go.c b/harbour/extras/hbapollo/go.c
similarity index 100%
rename from harbour/examples/hbapollo/go.c
rename to harbour/extras/hbapollo/go.c
diff --git a/harbour/examples/hbapollo/hbapollo.hbc b/harbour/extras/hbapollo/hbapollo.hbc
similarity index 100%
rename from harbour/examples/hbapollo/hbapollo.hbc
rename to harbour/extras/hbapollo/hbapollo.hbc
diff --git a/harbour/examples/hbapollo/hbapollo.hbp b/harbour/extras/hbapollo/hbapollo.hbp
similarity index 100%
rename from harbour/examples/hbapollo/hbapollo.hbp
rename to harbour/extras/hbapollo/hbapollo.hbp
diff --git a/harbour/examples/hbapollo/index.c b/harbour/extras/hbapollo/index.c
similarity index 100%
rename from harbour/examples/hbapollo/index.c
rename to harbour/extras/hbapollo/index.c
diff --git a/harbour/examples/hbapollo/isnull.c b/harbour/extras/hbapollo/isnull.c
similarity index 100%
rename from harbour/examples/hbapollo/isnull.c
rename to harbour/extras/hbapollo/isnull.c
diff --git a/harbour/examples/hbapollo/lock.c b/harbour/extras/hbapollo/lock.c
similarity index 100%
rename from harbour/examples/hbapollo/lock.c
rename to harbour/extras/hbapollo/lock.c
diff --git a/harbour/examples/hbapollo/put.c b/harbour/extras/hbapollo/put.c
similarity index 100%
rename from harbour/examples/hbapollo/put.c
rename to harbour/extras/hbapollo/put.c
diff --git a/harbour/examples/hbapollo/query.c b/harbour/extras/hbapollo/query.c
similarity index 100%
rename from harbour/examples/hbapollo/query.c
rename to harbour/extras/hbapollo/query.c
diff --git a/harbour/examples/hbapollo/rec.c b/harbour/extras/hbapollo/rec.c
similarity index 100%
rename from harbour/examples/hbapollo/rec.c
rename to harbour/extras/hbapollo/rec.c
diff --git a/harbour/examples/hbapollo/replace.c b/harbour/extras/hbapollo/replace.c
similarity index 100%
rename from harbour/examples/hbapollo/replace.c
rename to harbour/extras/hbapollo/replace.c
diff --git a/harbour/examples/hbapollo/ryo.c b/harbour/extras/hbapollo/ryo.c
similarity index 100%
rename from harbour/examples/hbapollo/ryo.c
rename to harbour/extras/hbapollo/ryo.c
diff --git a/harbour/examples/hbapollo/sde.c b/harbour/extras/hbapollo/sde.c
similarity index 100%
rename from harbour/examples/hbapollo/sde.c
rename to harbour/extras/hbapollo/sde.c
diff --git a/harbour/examples/hbapollo/seek.c b/harbour/extras/hbapollo/seek.c
similarity index 100%
rename from harbour/examples/hbapollo/seek.c
rename to harbour/extras/hbapollo/seek.c
diff --git a/harbour/examples/hbapollo/select.c b/harbour/extras/hbapollo/select.c
similarity index 100%
rename from harbour/examples/hbapollo/select.c
rename to harbour/extras/hbapollo/select.c
diff --git a/harbour/examples/hbapollo/set.c b/harbour/extras/hbapollo/set.c
similarity index 100%
rename from harbour/examples/hbapollo/set.c
rename to harbour/extras/hbapollo/set.c
diff --git a/harbour/examples/hbapollo/sixapi.ch b/harbour/extras/hbapollo/sixapi.ch
similarity index 100%
rename from harbour/examples/hbapollo/sixapi.ch
rename to harbour/extras/hbapollo/sixapi.ch
diff --git a/harbour/examples/hbapollo/skip.c b/harbour/extras/hbapollo/skip.c
similarity index 100%
rename from harbour/examples/hbapollo/skip.c
rename to harbour/extras/hbapollo/skip.c
diff --git a/harbour/examples/hbapollo/str.c b/harbour/extras/hbapollo/str.c
similarity index 100%
rename from harbour/examples/hbapollo/str.c
rename to harbour/extras/hbapollo/str.c
diff --git a/harbour/examples/hbapollo/sxapi.h b/harbour/extras/hbapollo/sxapi.h
similarity index 100%
rename from harbour/examples/hbapollo/sxapi.h
rename to harbour/extras/hbapollo/sxapi.h
diff --git a/harbour/examples/hbapollo/sysprop.c b/harbour/extras/hbapollo/sysprop.c
similarity index 100%
rename from harbour/examples/hbapollo/sysprop.c
rename to harbour/extras/hbapollo/sysprop.c
diff --git a/harbour/examples/hbapollo/tests/hbmk.hbm b/harbour/extras/hbapollo/tests/hbmk.hbm
similarity index 100%
rename from harbour/examples/hbapollo/tests/hbmk.hbm
rename to harbour/extras/hbapollo/tests/hbmk.hbm
diff --git a/harbour/examples/hbapollo/tests/test01.prg b/harbour/extras/hbapollo/tests/test01.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test01.prg
rename to harbour/extras/hbapollo/tests/test01.prg
diff --git a/harbour/examples/hbapollo/tests/test02.prg b/harbour/extras/hbapollo/tests/test02.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test02.prg
rename to harbour/extras/hbapollo/tests/test02.prg
diff --git a/harbour/examples/hbapollo/tests/test03.prg b/harbour/extras/hbapollo/tests/test03.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test03.prg
rename to harbour/extras/hbapollo/tests/test03.prg
diff --git a/harbour/examples/hbapollo/tests/test04.prg b/harbour/extras/hbapollo/tests/test04.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test04.prg
rename to harbour/extras/hbapollo/tests/test04.prg
diff --git a/harbour/examples/hbapollo/tests/test05.prg b/harbour/extras/hbapollo/tests/test05.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test05.prg
rename to harbour/extras/hbapollo/tests/test05.prg
diff --git a/harbour/examples/hbapollo/tests/test06.prg b/harbour/extras/hbapollo/tests/test06.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test06.prg
rename to harbour/extras/hbapollo/tests/test06.prg
diff --git a/harbour/examples/hbapollo/tests/test07.prg b/harbour/extras/hbapollo/tests/test07.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test07.prg
rename to harbour/extras/hbapollo/tests/test07.prg
diff --git a/harbour/examples/hbapollo/tests/test08.prg b/harbour/extras/hbapollo/tests/test08.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test08.prg
rename to harbour/extras/hbapollo/tests/test08.prg
diff --git a/harbour/examples/hbapollo/tests/test09.prg b/harbour/extras/hbapollo/tests/test09.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test09.prg
rename to harbour/extras/hbapollo/tests/test09.prg
diff --git a/harbour/examples/hbapollo/tests/test10.prg b/harbour/extras/hbapollo/tests/test10.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test10.prg
rename to harbour/extras/hbapollo/tests/test10.prg
diff --git a/harbour/examples/hbapollo/tests/test11.prg b/harbour/extras/hbapollo/tests/test11.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test11.prg
rename to harbour/extras/hbapollo/tests/test11.prg
diff --git a/harbour/examples/hbapollo/tests/test12.prg b/harbour/extras/hbapollo/tests/test12.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test12.prg
rename to harbour/extras/hbapollo/tests/test12.prg
diff --git a/harbour/examples/hbapollo/tests/test13.prg b/harbour/extras/hbapollo/tests/test13.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test13.prg
rename to harbour/extras/hbapollo/tests/test13.prg
diff --git a/harbour/examples/hbapollo/tests/test14.prg b/harbour/extras/hbapollo/tests/test14.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test14.prg
rename to harbour/extras/hbapollo/tests/test14.prg
diff --git a/harbour/examples/hbapollo/tests/test15.prg b/harbour/extras/hbapollo/tests/test15.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test15.prg
rename to harbour/extras/hbapollo/tests/test15.prg
diff --git a/harbour/examples/hbapollo/tests/test16.prg b/harbour/extras/hbapollo/tests/test16.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test16.prg
rename to harbour/extras/hbapollo/tests/test16.prg
diff --git a/harbour/examples/hbapollo/tests/test17.prg b/harbour/extras/hbapollo/tests/test17.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test17.prg
rename to harbour/extras/hbapollo/tests/test17.prg
diff --git a/harbour/examples/hbapollo/tests/test18.prg b/harbour/extras/hbapollo/tests/test18.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test18.prg
rename to harbour/extras/hbapollo/tests/test18.prg
diff --git a/harbour/examples/hbapollo/tests/test19.prg b/harbour/extras/hbapollo/tests/test19.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test19.prg
rename to harbour/extras/hbapollo/tests/test19.prg
diff --git a/harbour/examples/hbapollo/tests/test20.prg b/harbour/extras/hbapollo/tests/test20.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test20.prg
rename to harbour/extras/hbapollo/tests/test20.prg
diff --git a/harbour/examples/hbapollo/tests/test21.prg b/harbour/extras/hbapollo/tests/test21.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test21.prg
rename to harbour/extras/hbapollo/tests/test21.prg
diff --git a/harbour/examples/hbapollo/tests/test22.prg b/harbour/extras/hbapollo/tests/test22.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test22.prg
rename to harbour/extras/hbapollo/tests/test22.prg
diff --git a/harbour/examples/hbapollo/tests/test23.prg b/harbour/extras/hbapollo/tests/test23.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test23.prg
rename to harbour/extras/hbapollo/tests/test23.prg
diff --git a/harbour/examples/hbapollo/tests/test24.prg b/harbour/extras/hbapollo/tests/test24.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test24.prg
rename to harbour/extras/hbapollo/tests/test24.prg
diff --git a/harbour/examples/hbapollo/tests/test25.prg b/harbour/extras/hbapollo/tests/test25.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test25.prg
rename to harbour/extras/hbapollo/tests/test25.prg
diff --git a/harbour/examples/hbapollo/tests/test26.prg b/harbour/extras/hbapollo/tests/test26.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test26.prg
rename to harbour/extras/hbapollo/tests/test26.prg
diff --git a/harbour/examples/hbapollo/tests/test27.prg b/harbour/extras/hbapollo/tests/test27.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test27.prg
rename to harbour/extras/hbapollo/tests/test27.prg
diff --git a/harbour/examples/hbapollo/tests/test28.prg b/harbour/extras/hbapollo/tests/test28.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test28.prg
rename to harbour/extras/hbapollo/tests/test28.prg
diff --git a/harbour/examples/hbapollo/tests/test29.prg b/harbour/extras/hbapollo/tests/test29.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test29.prg
rename to harbour/extras/hbapollo/tests/test29.prg
diff --git a/harbour/examples/hbapollo/tests/test30.prg b/harbour/extras/hbapollo/tests/test30.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test30.prg
rename to harbour/extras/hbapollo/tests/test30.prg
diff --git a/harbour/examples/hbapollo/tests/test31.prg b/harbour/extras/hbapollo/tests/test31.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test31.prg
rename to harbour/extras/hbapollo/tests/test31.prg
diff --git a/harbour/examples/hbapollo/tests/test32.prg b/harbour/extras/hbapollo/tests/test32.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test32.prg
rename to harbour/extras/hbapollo/tests/test32.prg
diff --git a/harbour/examples/hbapollo/tests/test33.prg b/harbour/extras/hbapollo/tests/test33.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test33.prg
rename to harbour/extras/hbapollo/tests/test33.prg
diff --git a/harbour/examples/hbapollo/tests/test34.prg b/harbour/extras/hbapollo/tests/test34.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test34.prg
rename to harbour/extras/hbapollo/tests/test34.prg
diff --git a/harbour/examples/hbapollo/tests/test35.prg b/harbour/extras/hbapollo/tests/test35.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test35.prg
rename to harbour/extras/hbapollo/tests/test35.prg
diff --git a/harbour/examples/hbapollo/tests/test36.prg b/harbour/extras/hbapollo/tests/test36.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test36.prg
rename to harbour/extras/hbapollo/tests/test36.prg
diff --git a/harbour/examples/hbapollo/tests/test37.prg b/harbour/extras/hbapollo/tests/test37.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test37.prg
rename to harbour/extras/hbapollo/tests/test37.prg
diff --git a/harbour/examples/hbapollo/tests/test38.prg b/harbour/extras/hbapollo/tests/test38.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test38.prg
rename to harbour/extras/hbapollo/tests/test38.prg
diff --git a/harbour/examples/hbapollo/tests/test39.prg b/harbour/extras/hbapollo/tests/test39.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test39.prg
rename to harbour/extras/hbapollo/tests/test39.prg
diff --git a/harbour/examples/hbapollo/tests/test40.prg b/harbour/extras/hbapollo/tests/test40.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test40.prg
rename to harbour/extras/hbapollo/tests/test40.prg
diff --git a/harbour/examples/hbapollo/tests/test41.prg b/harbour/extras/hbapollo/tests/test41.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test41.prg
rename to harbour/extras/hbapollo/tests/test41.prg
diff --git a/harbour/examples/hbapollo/tests/test42.prg b/harbour/extras/hbapollo/tests/test42.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test42.prg
rename to harbour/extras/hbapollo/tests/test42.prg
diff --git a/harbour/examples/hbapollo/tests/test43.prg b/harbour/extras/hbapollo/tests/test43.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test43.prg
rename to harbour/extras/hbapollo/tests/test43.prg
diff --git a/harbour/examples/hbapollo/tests/test44.prg b/harbour/extras/hbapollo/tests/test44.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test44.prg
rename to harbour/extras/hbapollo/tests/test44.prg
diff --git a/harbour/examples/hbapollo/tests/test45.prg b/harbour/extras/hbapollo/tests/test45.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test45.prg
rename to harbour/extras/hbapollo/tests/test45.prg
diff --git a/harbour/examples/hbapollo/tests/test46.prg b/harbour/extras/hbapollo/tests/test46.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test46.prg
rename to harbour/extras/hbapollo/tests/test46.prg
diff --git a/harbour/examples/hbapollo/tests/test47.prg b/harbour/extras/hbapollo/tests/test47.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test47.prg
rename to harbour/extras/hbapollo/tests/test47.prg
diff --git a/harbour/examples/hbapollo/tests/test48.prg b/harbour/extras/hbapollo/tests/test48.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test48.prg
rename to harbour/extras/hbapollo/tests/test48.prg
diff --git a/harbour/examples/hbapollo/tests/test49.prg b/harbour/extras/hbapollo/tests/test49.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test49.prg
rename to harbour/extras/hbapollo/tests/test49.prg
diff --git a/harbour/examples/hbapollo/tests/test50.prg b/harbour/extras/hbapollo/tests/test50.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test50.prg
rename to harbour/extras/hbapollo/tests/test50.prg
diff --git a/harbour/examples/hbapollo/tests/test51.prg b/harbour/extras/hbapollo/tests/test51.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test51.prg
rename to harbour/extras/hbapollo/tests/test51.prg
diff --git a/harbour/examples/hbapollo/tests/test51h.prg b/harbour/extras/hbapollo/tests/test51h.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test51h.prg
rename to harbour/extras/hbapollo/tests/test51h.prg
diff --git a/harbour/examples/hbapollo/tests/test52.prg b/harbour/extras/hbapollo/tests/test52.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test52.prg
rename to harbour/extras/hbapollo/tests/test52.prg
diff --git a/harbour/examples/hbapollo/tests/test53.prg b/harbour/extras/hbapollo/tests/test53.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test53.prg
rename to harbour/extras/hbapollo/tests/test53.prg
diff --git a/harbour/examples/hbapollo/tests/test54.prg b/harbour/extras/hbapollo/tests/test54.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test54.prg
rename to harbour/extras/hbapollo/tests/test54.prg
diff --git a/harbour/examples/hbapollo/tests/test55.prg b/harbour/extras/hbapollo/tests/test55.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test55.prg
rename to harbour/extras/hbapollo/tests/test55.prg
diff --git a/harbour/examples/hbapollo/tests/test56.prg b/harbour/extras/hbapollo/tests/test56.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test56.prg
rename to harbour/extras/hbapollo/tests/test56.prg
diff --git a/harbour/examples/hbapollo/tests/test57.prg b/harbour/extras/hbapollo/tests/test57.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test57.prg
rename to harbour/extras/hbapollo/tests/test57.prg
diff --git a/harbour/examples/hbapollo/tests/test58.prg b/harbour/extras/hbapollo/tests/test58.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test58.prg
rename to harbour/extras/hbapollo/tests/test58.prg
diff --git a/harbour/examples/hbapollo/tests/test59.prg b/harbour/extras/hbapollo/tests/test59.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test59.prg
rename to harbour/extras/hbapollo/tests/test59.prg
diff --git a/harbour/examples/hbapollo/tests/test60.prg b/harbour/extras/hbapollo/tests/test60.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test60.prg
rename to harbour/extras/hbapollo/tests/test60.prg
diff --git a/harbour/examples/hbapollo/tests/test61.prg b/harbour/extras/hbapollo/tests/test61.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test61.prg
rename to harbour/extras/hbapollo/tests/test61.prg
diff --git a/harbour/examples/hbapollo/tests/test62.prg b/harbour/extras/hbapollo/tests/test62.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test62.prg
rename to harbour/extras/hbapollo/tests/test62.prg
diff --git a/harbour/examples/hbapollo/tests/test63.prg b/harbour/extras/hbapollo/tests/test63.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test63.prg
rename to harbour/extras/hbapollo/tests/test63.prg
diff --git a/harbour/examples/hbapollo/tests/test64.prg b/harbour/extras/hbapollo/tests/test64.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test64.prg
rename to harbour/extras/hbapollo/tests/test64.prg
diff --git a/harbour/examples/hbapollo/tests/test65.prg b/harbour/extras/hbapollo/tests/test65.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test65.prg
rename to harbour/extras/hbapollo/tests/test65.prg
diff --git a/harbour/examples/hbapollo/tests/test66.prg b/harbour/extras/hbapollo/tests/test66.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test66.prg
rename to harbour/extras/hbapollo/tests/test66.prg
diff --git a/harbour/examples/hbapollo/tests/test67.prg b/harbour/extras/hbapollo/tests/test67.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test67.prg
rename to harbour/extras/hbapollo/tests/test67.prg
diff --git a/harbour/examples/hbapollo/tests/test68.prg b/harbour/extras/hbapollo/tests/test68.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test68.prg
rename to harbour/extras/hbapollo/tests/test68.prg
diff --git a/harbour/examples/hbapollo/tests/test69.prg b/harbour/extras/hbapollo/tests/test69.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test69.prg
rename to harbour/extras/hbapollo/tests/test69.prg
diff --git a/harbour/examples/hbapollo/tests/test70.prg b/harbour/extras/hbapollo/tests/test70.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test70.prg
rename to harbour/extras/hbapollo/tests/test70.prg
diff --git a/harbour/examples/hbapollo/tests/test71.prg b/harbour/extras/hbapollo/tests/test71.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test71.prg
rename to harbour/extras/hbapollo/tests/test71.prg
diff --git a/harbour/examples/hbapollo/tests/test72.prg b/harbour/extras/hbapollo/tests/test72.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test72.prg
rename to harbour/extras/hbapollo/tests/test72.prg
diff --git a/harbour/examples/hbapollo/tests/test73.prg b/harbour/extras/hbapollo/tests/test73.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test73.prg
rename to harbour/extras/hbapollo/tests/test73.prg
diff --git a/harbour/examples/hbapollo/tests/test74.prg b/harbour/extras/hbapollo/tests/test74.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test74.prg
rename to harbour/extras/hbapollo/tests/test74.prg
diff --git a/harbour/examples/hbapollo/tests/test75.prg b/harbour/extras/hbapollo/tests/test75.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test75.prg
rename to harbour/extras/hbapollo/tests/test75.prg
diff --git a/harbour/examples/hbapollo/tests/test76.prg b/harbour/extras/hbapollo/tests/test76.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test76.prg
rename to harbour/extras/hbapollo/tests/test76.prg
diff --git a/harbour/examples/hbapollo/tests/test77.prg b/harbour/extras/hbapollo/tests/test77.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test77.prg
rename to harbour/extras/hbapollo/tests/test77.prg
diff --git a/harbour/examples/hbapollo/tests/test78.prg b/harbour/extras/hbapollo/tests/test78.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test78.prg
rename to harbour/extras/hbapollo/tests/test78.prg
diff --git a/harbour/examples/hbapollo/tests/test79.prg b/harbour/extras/hbapollo/tests/test79.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test79.prg
rename to harbour/extras/hbapollo/tests/test79.prg
diff --git a/harbour/examples/hbapollo/tests/test80.prg b/harbour/extras/hbapollo/tests/test80.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test80.prg
rename to harbour/extras/hbapollo/tests/test80.prg
diff --git a/harbour/examples/hbapollo/tests/test81.prg b/harbour/extras/hbapollo/tests/test81.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test81.prg
rename to harbour/extras/hbapollo/tests/test81.prg
diff --git a/harbour/examples/hbapollo/tests/test82.prg b/harbour/extras/hbapollo/tests/test82.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test82.prg
rename to harbour/extras/hbapollo/tests/test82.prg
diff --git a/harbour/examples/hbapollo/tests/test83.prg b/harbour/extras/hbapollo/tests/test83.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test83.prg
rename to harbour/extras/hbapollo/tests/test83.prg
diff --git a/harbour/examples/hbapollo/tests/test84.prg b/harbour/extras/hbapollo/tests/test84.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test84.prg
rename to harbour/extras/hbapollo/tests/test84.prg
diff --git a/harbour/examples/hbapollo/tests/test85.prg b/harbour/extras/hbapollo/tests/test85.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/test85.prg
rename to harbour/extras/hbapollo/tests/test85.prg
diff --git a/harbour/examples/hbapollo/tests/tsix.prg b/harbour/extras/hbapollo/tests/tsix.prg
similarity index 100%
rename from harbour/examples/hbapollo/tests/tsix.prg
rename to harbour/extras/hbapollo/tests/tsix.prg
diff --git a/harbour/examples/hbapollo/tindex.prg b/harbour/extras/hbapollo/tindex.prg
similarity index 100%
rename from harbour/examples/hbapollo/tindex.prg
rename to harbour/extras/hbapollo/tindex.prg
diff --git a/harbour/examples/hbapollo/tools.c b/harbour/extras/hbapollo/tools.c
similarity index 100%
rename from harbour/examples/hbapollo/tools.c
rename to harbour/extras/hbapollo/tools.c
diff --git a/harbour/examples/hbapollo/ttable.prg b/harbour/extras/hbapollo/ttable.prg
similarity index 100%
rename from harbour/examples/hbapollo/ttable.prg
rename to harbour/extras/hbapollo/ttable.prg
diff --git a/harbour/examples/hbapollo/ttag.prg b/harbour/extras/hbapollo/ttag.prg
similarity index 100%
rename from harbour/examples/hbapollo/ttag.prg
rename to harbour/extras/hbapollo/ttag.prg
diff --git a/harbour/examples/hbapollo/unsix.ch b/harbour/extras/hbapollo/unsix.ch
similarity index 100%
rename from harbour/examples/hbapollo/unsix.ch
rename to harbour/extras/hbapollo/unsix.ch
diff --git a/harbour/examples/hbapollo/use.c b/harbour/extras/hbapollo/use.c
similarity index 100%
rename from harbour/examples/hbapollo/use.c
rename to harbour/extras/hbapollo/use.c
diff --git a/harbour/examples/hbdoc/genbase.prg b/harbour/extras/hbdoc/genbase.prg
similarity index 100%
rename from harbour/examples/hbdoc/genbase.prg
rename to harbour/extras/hbdoc/genbase.prg
diff --git a/harbour/examples/hbdoc/genhtml.prg b/harbour/extras/hbdoc/genhtml.prg
similarity index 100%
rename from harbour/examples/hbdoc/genhtml.prg
rename to harbour/extras/hbdoc/genhtml.prg
diff --git a/harbour/examples/hbdoc/gentxt.prg b/harbour/extras/hbdoc/gentxt.prg
similarity index 100%
rename from harbour/examples/hbdoc/gentxt.prg
rename to harbour/extras/hbdoc/gentxt.prg
diff --git a/harbour/examples/hbdoc/genxml.prg b/harbour/extras/hbdoc/genxml.prg
similarity index 100%
rename from harbour/examples/hbdoc/genxml.prg
rename to harbour/extras/hbdoc/genxml.prg
diff --git a/harbour/examples/hbdoc/hbdoc.ch b/harbour/extras/hbdoc/hbdoc.ch
similarity index 100%
rename from harbour/examples/hbdoc/hbdoc.ch
rename to harbour/extras/hbdoc/hbdoc.ch
diff --git a/harbour/examples/hbdoc/hbdoc.css b/harbour/extras/hbdoc/hbdoc.css
similarity index 100%
rename from harbour/examples/hbdoc/hbdoc.css
rename to harbour/extras/hbdoc/hbdoc.css
diff --git a/harbour/examples/hbdoc/hbdoc.hbp b/harbour/extras/hbdoc/hbdoc.hbp
similarity index 100%
rename from harbour/examples/hbdoc/hbdoc.hbp
rename to harbour/extras/hbdoc/hbdoc.hbp
diff --git a/harbour/examples/hbdoc/hbdoc.prg b/harbour/extras/hbdoc/hbdoc.prg
similarity index 100%
rename from harbour/examples/hbdoc/hbdoc.prg
rename to harbour/extras/hbdoc/hbdoc.prg
diff --git a/harbour/examples/hbdoc/tmplates.prg b/harbour/extras/hbdoc/tmplates.prg
similarity index 100%
rename from harbour/examples/hbdoc/tmplates.prg
rename to harbour/extras/hbdoc/tmplates.prg
diff --git a/harbour/examples/hbvpdf/hbvpdf.ch b/harbour/extras/hbvpdf/hbvpdf.ch
similarity index 100%
rename from harbour/examples/hbvpdf/hbvpdf.ch
rename to harbour/extras/hbvpdf/hbvpdf.ch
diff --git a/harbour/examples/hbvpdf/hbvpdf.hbc b/harbour/extras/hbvpdf/hbvpdf.hbc
similarity index 100%
rename from harbour/examples/hbvpdf/hbvpdf.hbc
rename to harbour/extras/hbvpdf/hbvpdf.hbc
diff --git a/harbour/examples/hbvpdf/hbvpdf.hbp b/harbour/extras/hbvpdf/hbvpdf.hbp
similarity index 100%
rename from harbour/examples/hbvpdf/hbvpdf.hbp
rename to harbour/extras/hbvpdf/hbvpdf.hbp
diff --git a/harbour/examples/hbvpdf/hbvpdf.prg b/harbour/extras/hbvpdf/hbvpdf.prg
similarity index 100%
rename from harbour/examples/hbvpdf/hbvpdf.prg
rename to harbour/extras/hbvpdf/hbvpdf.prg
diff --git a/harbour/examples/hbvpdf/hbvpdft.prg b/harbour/extras/hbvpdf/hbvpdft.prg
similarity index 100%
rename from harbour/examples/hbvpdf/hbvpdft.prg
rename to harbour/extras/hbvpdf/hbvpdft.prg
diff --git a/harbour/examples/hbvpdf/hbvpsup.prg b/harbour/extras/hbvpdf/hbvpsup.prg
similarity index 100%
rename from harbour/examples/hbvpdf/hbvpsup.prg
rename to harbour/extras/hbvpdf/hbvpsup.prg
diff --git a/harbour/examples/hbvpdf/readme.txt b/harbour/extras/hbvpdf/readme.txt
similarity index 100%
rename from harbour/examples/hbvpdf/readme.txt
rename to harbour/extras/hbvpdf/readme.txt
diff --git a/harbour/examples/hbvpdf/tests/files/color.jpg b/harbour/extras/hbvpdf/tests/files/color.jpg
similarity index 100%
rename from harbour/examples/hbvpdf/tests/files/color.jpg
rename to harbour/extras/hbvpdf/tests/files/color.jpg
diff --git a/harbour/examples/hbvpdf/tests/files/color.tif b/harbour/extras/hbvpdf/tests/files/color.tif
similarity index 100%
rename from harbour/examples/hbvpdf/tests/files/color.tif
rename to harbour/extras/hbvpdf/tests/files/color.tif
diff --git a/harbour/examples/hbvpdf/tests/files/test.txt b/harbour/extras/hbvpdf/tests/files/test.txt
similarity index 100%
rename from harbour/examples/hbvpdf/tests/files/test.txt
rename to harbour/extras/hbvpdf/tests/files/test.txt
diff --git a/harbour/examples/hbvpdf/tests/hbmk.hbm b/harbour/extras/hbvpdf/tests/hbmk.hbm
similarity index 100%
rename from harbour/examples/hbvpdf/tests/hbmk.hbm
rename to harbour/extras/hbvpdf/tests/hbmk.hbm
diff --git a/harbour/examples/hbvpdf/tests/pdf_demo.prg b/harbour/extras/hbvpdf/tests/pdf_demo.prg
similarity index 100%
rename from harbour/examples/hbvpdf/tests/pdf_demo.prg
rename to harbour/extras/hbvpdf/tests/pdf_demo.prg
diff --git a/harbour/examples/hbvpdf/tests/tstpdf.prg b/harbour/extras/hbvpdf/tests/tstpdf.prg
similarity index 100%
rename from harbour/examples/hbvpdf/tests/tstpdf.prg
rename to harbour/extras/hbvpdf/tests/tstpdf.prg
diff --git a/harbour/examples/hbxlsxml/hbxlsxml.hbp b/harbour/extras/hbxlsxml/hbxlsxml.hbp
similarity index 100%
rename from harbour/examples/hbxlsxml/hbxlsxml.hbp
rename to harbour/extras/hbxlsxml/hbxlsxml.hbp
diff --git a/harbour/examples/hbxlsxml/tests/example.prg b/harbour/extras/hbxlsxml/tests/example.prg
similarity index 100%
rename from harbour/examples/hbxlsxml/tests/example.prg
rename to harbour/extras/hbxlsxml/tests/example.prg
diff --git a/harbour/examples/hbxlsxml/tests/example2.prg b/harbour/extras/hbxlsxml/tests/example2.prg
similarity index 100%
rename from harbour/examples/hbxlsxml/tests/example2.prg
rename to harbour/extras/hbxlsxml/tests/example2.prg
diff --git a/harbour/examples/hbxlsxml/tests/example3.prg b/harbour/extras/hbxlsxml/tests/example3.prg
similarity index 100%
rename from harbour/examples/hbxlsxml/tests/example3.prg
rename to harbour/extras/hbxlsxml/tests/example3.prg
diff --git a/harbour/examples/hbxlsxml/tests/hbmk.hbm b/harbour/extras/hbxlsxml/tests/hbmk.hbm
similarity index 100%
rename from harbour/examples/hbxlsxml/tests/hbmk.hbm
rename to harbour/extras/hbxlsxml/tests/hbmk.hbm
diff --git a/harbour/examples/hbxlsxml/xlsxml.prg b/harbour/extras/hbxlsxml/xlsxml.prg
similarity index 100%
rename from harbour/examples/hbxlsxml/xlsxml.prg
rename to harbour/extras/hbxlsxml/xlsxml.prg
diff --git a/harbour/examples/hbxlsxml/xlsxml_s.prg b/harbour/extras/hbxlsxml/xlsxml_s.prg
similarity index 100%
rename from harbour/examples/hbxlsxml/xlsxml_s.prg
rename to harbour/extras/hbxlsxml/xlsxml_s.prg
diff --git a/harbour/examples/hbxlsxml/xlsxml_y.prg b/harbour/extras/hbxlsxml/xlsxml_y.prg
similarity index 100%
rename from harbour/examples/hbxlsxml/xlsxml_y.prg
rename to harbour/extras/hbxlsxml/xlsxml_y.prg
diff --git a/harbour/examples/httpsrv/cgifunc.prg b/harbour/extras/httpsrv/cgifunc.prg
similarity index 100%
rename from harbour/examples/httpsrv/cgifunc.prg
rename to harbour/extras/httpsrv/cgifunc.prg
diff --git a/harbour/examples/httpsrv/cookie.prg b/harbour/extras/httpsrv/cookie.prg
similarity index 100%
rename from harbour/examples/httpsrv/cookie.prg
rename to harbour/extras/httpsrv/cookie.prg
diff --git a/harbour/examples/httpsrv/home/counter.html b/harbour/extras/httpsrv/home/counter.html
similarity index 100%
rename from harbour/examples/httpsrv/home/counter.html
rename to harbour/extras/httpsrv/home/counter.html
diff --git a/harbour/examples/httpsrv/home/css/base.css b/harbour/extras/httpsrv/home/css/base.css
similarity index 100%
rename from harbour/examples/httpsrv/home/css/base.css
rename to harbour/extras/httpsrv/home/css/base.css
diff --git a/harbour/examples/httpsrv/home/favicon.ico b/harbour/extras/httpsrv/home/favicon.ico
similarity index 100%
rename from harbour/examples/httpsrv/home/favicon.ico
rename to harbour/extras/httpsrv/home/favicon.ico
diff --git a/harbour/examples/httpsrv/home/images/ajax-loader.gif b/harbour/extras/httpsrv/home/images/ajax-loader.gif
similarity index 100%
rename from harbour/examples/httpsrv/home/images/ajax-loader.gif
rename to harbour/extras/httpsrv/home/images/ajax-loader.gif
diff --git a/harbour/examples/httpsrv/home/index.html b/harbour/extras/httpsrv/home/index.html
similarity index 100%
rename from harbour/examples/httpsrv/home/index.html
rename to harbour/extras/httpsrv/home/index.html
diff --git a/harbour/examples/httpsrv/home/js/ajax.js b/harbour/extras/httpsrv/home/js/ajax.js
similarity index 100%
rename from harbour/examples/httpsrv/home/js/ajax.js
rename to harbour/extras/httpsrv/home/js/ajax.js
diff --git a/harbour/examples/httpsrv/home/postsample.html b/harbour/extras/httpsrv/home/postsample.html
similarity index 100%
rename from harbour/examples/httpsrv/home/postsample.html
rename to harbour/extras/httpsrv/home/postsample.html
diff --git a/harbour/examples/httpsrv/home/testajax.html b/harbour/extras/httpsrv/home/testajax.html
similarity index 100%
rename from harbour/examples/httpsrv/home/testajax.html
rename to harbour/extras/httpsrv/home/testajax.html
diff --git a/harbour/examples/httpsrv/home/testxmldb.html b/harbour/extras/httpsrv/home/testxmldb.html
similarity index 100%
rename from harbour/examples/httpsrv/home/testxmldb.html
rename to harbour/extras/httpsrv/home/testxmldb.html
diff --git a/harbour/examples/httpsrv/home/xsl/based.xsl b/harbour/extras/httpsrv/home/xsl/based.xsl
similarity index 100%
rename from harbour/examples/httpsrv/home/xsl/based.xsl
rename to harbour/extras/httpsrv/home/xsl/based.xsl
diff --git a/harbour/examples/httpsrv/home/xsl/basep.xsl b/harbour/extras/httpsrv/home/xsl/basep.xsl
similarity index 100%
rename from harbour/examples/httpsrv/home/xsl/basep.xsl
rename to harbour/extras/httpsrv/home/xsl/basep.xsl
diff --git a/harbour/examples/httpsrv/modules.hbp b/harbour/extras/httpsrv/modules.hbp
similarity index 100%
rename from harbour/examples/httpsrv/modules.hbp
rename to harbour/extras/httpsrv/modules.hbp
diff --git a/harbour/examples/httpsrv/modules/cookie.prg b/harbour/extras/httpsrv/modules/cookie.prg
similarity index 100%
rename from harbour/examples/httpsrv/modules/cookie.prg
rename to harbour/extras/httpsrv/modules/cookie.prg
diff --git a/harbour/examples/httpsrv/modules/info.prg b/harbour/extras/httpsrv/modules/info.prg
similarity index 100%
rename from harbour/examples/httpsrv/modules/info.prg
rename to harbour/extras/httpsrv/modules/info.prg
diff --git a/harbour/examples/httpsrv/modules/showcounter.prg b/harbour/extras/httpsrv/modules/showcounter.prg
similarity index 100%
rename from harbour/examples/httpsrv/modules/showcounter.prg
rename to harbour/extras/httpsrv/modules/showcounter.prg
diff --git a/harbour/examples/httpsrv/modules/tableservletdb.prg b/harbour/extras/httpsrv/modules/tableservletdb.prg
similarity index 100%
rename from harbour/examples/httpsrv/modules/tableservletdb.prg
rename to harbour/extras/httpsrv/modules/tableservletdb.prg
diff --git a/harbour/examples/httpsrv/modules/testajax.prg b/harbour/extras/httpsrv/modules/testajax.prg
similarity index 100%
rename from harbour/examples/httpsrv/modules/testajax.prg
rename to harbour/extras/httpsrv/modules/testajax.prg
diff --git a/harbour/examples/httpsrv/modulesg.hbp b/harbour/extras/httpsrv/modulesg.hbp
similarity index 100%
rename from harbour/examples/httpsrv/modulesg.hbp
rename to harbour/extras/httpsrv/modulesg.hbp
diff --git a/harbour/examples/httpsrv/readme.txt b/harbour/extras/httpsrv/readme.txt
similarity index 100%
rename from harbour/examples/httpsrv/readme.txt
rename to harbour/extras/httpsrv/readme.txt
diff --git a/harbour/examples/httpsrv/session.prg b/harbour/extras/httpsrv/session.prg
similarity index 100%
rename from harbour/examples/httpsrv/session.prg
rename to harbour/extras/httpsrv/session.prg
diff --git a/harbour/examples/httpsrv/uhttpd.hbp b/harbour/extras/httpsrv/uhttpd.hbp
similarity index 100%
rename from harbour/examples/httpsrv/uhttpd.hbp
rename to harbour/extras/httpsrv/uhttpd.hbp
diff --git a/harbour/examples/httpsrv/uhttpd.ini b/harbour/extras/httpsrv/uhttpd.ini
similarity index 100%
rename from harbour/examples/httpsrv/uhttpd.ini
rename to harbour/extras/httpsrv/uhttpd.ini
diff --git a/harbour/examples/httpsrv/uhttpd.prg b/harbour/extras/httpsrv/uhttpd.prg
similarity index 100%
rename from harbour/examples/httpsrv/uhttpd.prg
rename to harbour/extras/httpsrv/uhttpd.prg
diff --git a/harbour/examples/httpsrv/uhttpdgd.hbp b/harbour/extras/httpsrv/uhttpdgd.hbp
similarity index 100%
rename from harbour/examples/httpsrv/uhttpdgd.hbp
rename to harbour/extras/httpsrv/uhttpdgd.hbp
diff --git a/harbour/examples/ps32/ps32.dif b/harbour/extras/ps32/ps32.dif
similarity index 100%
rename from harbour/examples/ps32/ps32.dif
rename to harbour/extras/ps32/ps32.dif
diff --git a/harbour/examples/ps32/ps32.hbc b/harbour/extras/ps32/ps32.hbc
similarity index 100%
rename from harbour/examples/ps32/ps32.hbc
rename to harbour/extras/ps32/ps32.hbc
diff --git a/harbour/examples/ps32/ps32.hbp b/harbour/extras/ps32/ps32.hbp
similarity index 100%
rename from harbour/examples/ps32/ps32.hbp
rename to harbour/extras/ps32/ps32.hbp
diff --git a/harbour/examples/ps32/readme.txt b/harbour/extras/ps32/readme.txt
similarity index 100%
rename from harbour/examples/ps32/readme.txt
rename to harbour/extras/ps32/readme.txt
diff --git a/harbour/examples/ps32/tests/hbmk.hbm b/harbour/extras/ps32/tests/hbmk.hbm
similarity index 100%
rename from harbour/examples/ps32/tests/hbmk.hbm
rename to harbour/extras/ps32/tests/hbmk.hbm
diff --git a/harbour/examples/rddado/adordd.ch b/harbour/extras/rddado/adordd.ch
similarity index 100%
rename from harbour/examples/rddado/adordd.ch
rename to harbour/extras/rddado/adordd.ch
diff --git a/harbour/examples/rddado/adordd.prg b/harbour/extras/rddado/adordd.prg
similarity index 100%
rename from harbour/examples/rddado/adordd.prg
rename to harbour/extras/rddado/adordd.prg
diff --git a/harbour/examples/rddado/rddado.hbc b/harbour/extras/rddado/rddado.hbc
similarity index 100%
rename from harbour/examples/rddado/rddado.hbc
rename to harbour/extras/rddado/rddado.hbc
diff --git a/harbour/examples/rddado/rddado.hbp b/harbour/extras/rddado/rddado.hbp
similarity index 100%
rename from harbour/examples/rddado/rddado.hbp
rename to harbour/extras/rddado/rddado.hbp
diff --git a/harbour/examples/rddado/tests/access1.prg b/harbour/extras/rddado/tests/access1.prg
similarity index 100%
rename from harbour/examples/rddado/tests/access1.prg
rename to harbour/extras/rddado/tests/access1.prg
diff --git a/harbour/examples/rddado/tests/access2.prg b/harbour/extras/rddado/tests/access2.prg
similarity index 100%
rename from harbour/examples/rddado/tests/access2.prg
rename to harbour/extras/rddado/tests/access2.prg
diff --git a/harbour/examples/rddado/tests/hbmk.hbm b/harbour/extras/rddado/tests/hbmk.hbm
similarity index 100%
rename from harbour/examples/rddado/tests/hbmk.hbm
rename to harbour/extras/rddado/tests/hbmk.hbm
diff --git a/harbour/examples/rddado/tests/mysql1.prg b/harbour/extras/rddado/tests/mysql1.prg
similarity index 100%
rename from harbour/examples/rddado/tests/mysql1.prg
rename to harbour/extras/rddado/tests/mysql1.prg
diff --git a/harbour/examples/rddado/tests/mysql3.prg b/harbour/extras/rddado/tests/mysql3.prg
similarity index 100%
rename from harbour/examples/rddado/tests/mysql3.prg
rename to harbour/extras/rddado/tests/mysql3.prg
diff --git a/harbour/examples/rddado/tests/test.mdb b/harbour/extras/rddado/tests/test.mdb
similarity index 100%
rename from harbour/examples/rddado/tests/test.mdb
rename to harbour/extras/rddado/tests/test.mdb
diff --git a/harbour/examples/rl/readme.txt b/harbour/extras/rl/readme.txt
similarity index 100%
rename from harbour/examples/rl/readme.txt
rename to harbour/extras/rl/readme.txt
diff --git a/harbour/examples/rl/rl.dif b/harbour/extras/rl/rl.dif
similarity index 100%
rename from harbour/examples/rl/rl.dif
rename to harbour/extras/rl/rl.dif
diff --git a/harbour/examples/rl/rl.hbp b/harbour/extras/rl/rl.hbp
similarity index 100%
rename from harbour/examples/rl/rl.hbp
rename to harbour/extras/rl/rl.hbp
diff --git a/harbour/examples/superlib/hbsuper.prg b/harbour/extras/superlib/hbsuper.prg
similarity index 100%
rename from harbour/examples/superlib/hbsuper.prg
rename to harbour/extras/superlib/hbsuper.prg
diff --git a/harbour/examples/superlib/readme.txt b/harbour/extras/superlib/readme.txt
similarity index 100%
rename from harbour/examples/superlib/readme.txt
rename to harbour/extras/superlib/readme.txt
diff --git a/harbour/examples/superlib/superlib.dif b/harbour/extras/superlib/superlib.dif
similarity index 100%
rename from harbour/examples/superlib/superlib.dif
rename to harbour/extras/superlib/superlib.dif
diff --git a/harbour/examples/superlib/superlib.hbc b/harbour/extras/superlib/superlib.hbc
similarity index 100%
rename from harbour/examples/superlib/superlib.hbc
rename to harbour/extras/superlib/superlib.hbc
diff --git a/harbour/examples/superlib/superlib.hbp b/harbour/extras/superlib/superlib.hbp
similarity index 100%
rename from harbour/examples/superlib/superlib.hbp
rename to harbour/extras/superlib/superlib.hbp