diff --git a/samples/bombs/.cvsignore b/demos/bombs/.cvsignore
similarity index 100%
rename from samples/bombs/.cvsignore
rename to demos/bombs/.cvsignore
diff --git a/samples/bombs/Makefile.in b/demos/bombs/Makefile.in
similarity index 100%
rename from samples/bombs/Makefile.in
rename to demos/bombs/Makefile.in
diff --git a/samples/bombs/bombs.bmp b/demos/bombs/bombs.bmp
similarity index 100%
rename from samples/bombs/bombs.bmp
rename to demos/bombs/bombs.bmp
diff --git a/samples/bombs/bombs.cpp b/demos/bombs/bombs.cpp
similarity index 100%
rename from samples/bombs/bombs.cpp
rename to demos/bombs/bombs.cpp
diff --git a/samples/bombs/bombs.def b/demos/bombs/bombs.def
similarity index 100%
rename from samples/bombs/bombs.def
rename to demos/bombs/bombs.def
diff --git a/samples/bombs/bombs.h b/demos/bombs/bombs.h
similarity index 100%
rename from samples/bombs/bombs.h
rename to demos/bombs/bombs.h
diff --git a/samples/bombs/bombs.ico b/demos/bombs/bombs.ico
similarity index 100%
rename from samples/bombs/bombs.ico
rename to demos/bombs/bombs.ico
diff --git a/samples/bombs/bombs.rc b/demos/bombs/bombs.rc
similarity index 100%
rename from samples/bombs/bombs.rc
rename to demos/bombs/bombs.rc
diff --git a/samples/bombs/bombs.xpm b/demos/bombs/bombs.xpm
similarity index 100%
rename from samples/bombs/bombs.xpm
rename to demos/bombs/bombs.xpm
diff --git a/samples/bombs/bombs1.cpp b/demos/bombs/bombs1.cpp
similarity index 100%
rename from samples/bombs/bombs1.cpp
rename to demos/bombs/bombs1.cpp
diff --git a/samples/bombs/descrip.mms b/demos/bombs/descrip.mms
similarity index 100%
rename from samples/bombs/descrip.mms
rename to demos/bombs/descrip.mms
diff --git a/samples/bombs/game.cpp b/demos/bombs/game.cpp
similarity index 100%
rename from samples/bombs/game.cpp
rename to demos/bombs/game.cpp
diff --git a/samples/bombs/game.h b/demos/bombs/game.h
similarity index 100%
rename from samples/bombs/game.h
rename to demos/bombs/game.h
diff --git a/samples/bombs/makefile.b32 b/demos/bombs/makefile.b32
similarity index 100%
rename from samples/bombs/makefile.b32
rename to demos/bombs/makefile.b32
diff --git a/samples/bombs/makefile.bcc b/demos/bombs/makefile.bcc
similarity index 100%
rename from samples/bombs/makefile.bcc
rename to demos/bombs/makefile.bcc
diff --git a/samples/bombs/makefile.dos b/demos/bombs/makefile.dos
similarity index 100%
rename from samples/bombs/makefile.dos
rename to demos/bombs/makefile.dos
diff --git a/samples/bombs/makefile.g95 b/demos/bombs/makefile.g95
similarity index 100%
rename from samples/bombs/makefile.g95
rename to demos/bombs/makefile.g95
diff --git a/samples/bombs/makefile.unx b/demos/bombs/makefile.unx
similarity index 100%
rename from samples/bombs/makefile.unx
rename to demos/bombs/makefile.unx
diff --git a/samples/bombs/makefile.vc b/demos/bombs/makefile.vc
similarity index 100%
rename from samples/bombs/makefile.vc
rename to demos/bombs/makefile.vc
diff --git a/samples/bombs/makefile.wat b/demos/bombs/makefile.wat
similarity index 100%
rename from samples/bombs/makefile.wat
rename to demos/bombs/makefile.wat
diff --git a/samples/bombs/readme.txt b/demos/bombs/readme.txt
similarity index 100%
rename from samples/bombs/readme.txt
rename to demos/bombs/readme.txt
diff --git a/samples/forty/.cvsignore b/demos/forty/.cvsignore
similarity index 100%
rename from samples/forty/.cvsignore
rename to demos/forty/.cvsignore
diff --git a/samples/forty/Makefile.in b/demos/forty/Makefile.in
similarity index 100%
rename from samples/forty/Makefile.in
rename to demos/forty/Makefile.in
diff --git a/samples/forty/canvas.cpp b/demos/forty/canvas.cpp
similarity index 100%
rename from samples/forty/canvas.cpp
rename to demos/forty/canvas.cpp
diff --git a/samples/forty/canvas.h b/demos/forty/canvas.h
similarity index 100%
rename from samples/forty/canvas.h
rename to demos/forty/canvas.h
diff --git a/samples/forty/card.cpp b/demos/forty/card.cpp
similarity index 100%
rename from samples/forty/card.cpp
rename to demos/forty/card.cpp
diff --git a/samples/forty/card.h b/demos/forty/card.h
similarity index 100%
rename from samples/forty/card.h
rename to demos/forty/card.h
diff --git a/samples/forty/cards.ico b/demos/forty/cards.ico
similarity index 100%
rename from samples/forty/cards.ico
rename to demos/forty/cards.ico
diff --git a/samples/forty/forty.cpp b/demos/forty/forty.cpp
similarity index 100%
rename from samples/forty/forty.cpp
rename to demos/forty/forty.cpp
diff --git a/samples/forty/forty.def b/demos/forty/forty.def
similarity index 100%
rename from samples/forty/forty.def
rename to demos/forty/forty.def
diff --git a/samples/forty/forty.h b/demos/forty/forty.h
similarity index 100%
rename from samples/forty/forty.h
rename to demos/forty/forty.h
diff --git a/samples/forty/forty.rc b/demos/forty/forty.rc
similarity index 100%
rename from samples/forty/forty.rc
rename to demos/forty/forty.rc
diff --git a/samples/forty/game.cpp b/demos/forty/game.cpp
similarity index 100%
rename from samples/forty/game.cpp
rename to demos/forty/game.cpp
diff --git a/samples/forty/game.h b/demos/forty/game.h
similarity index 100%
rename from samples/forty/game.h
rename to demos/forty/game.h
diff --git a/samples/forty/make_cw.mcp b/demos/forty/make_cw.mcp
similarity index 83%
rename from samples/forty/make_cw.mcp
rename to demos/forty/make_cw.mcp
index a5f441d99b..cc1070d6ef 100644
Binary files a/samples/forty/make_cw.mcp and b/demos/forty/make_cw.mcp differ
diff --git a/samples/forty/makefile.b32 b/demos/forty/makefile.b32
similarity index 100%
rename from samples/forty/makefile.b32
rename to demos/forty/makefile.b32
diff --git a/samples/forty/makefile.bcc b/demos/forty/makefile.bcc
similarity index 100%
rename from samples/forty/makefile.bcc
rename to demos/forty/makefile.bcc
diff --git a/samples/forty/makefile.dos b/demos/forty/makefile.dos
similarity index 100%
rename from samples/forty/makefile.dos
rename to demos/forty/makefile.dos
diff --git a/samples/forty/makefile.g95 b/demos/forty/makefile.g95
similarity index 100%
rename from samples/forty/makefile.g95
rename to demos/forty/makefile.g95
diff --git a/samples/forty/makefile.unx b/demos/forty/makefile.unx
similarity index 100%
rename from samples/forty/makefile.unx
rename to demos/forty/makefile.unx
diff --git a/samples/forty/makefile.vc b/demos/forty/makefile.vc
similarity index 100%
rename from samples/forty/makefile.vc
rename to demos/forty/makefile.vc
diff --git a/samples/forty/makefile.wat b/demos/forty/makefile.wat
similarity index 100%
rename from samples/forty/makefile.wat
rename to demos/forty/makefile.wat
diff --git a/samples/forty/pictures.bmp b/demos/forty/pictures.bmp
similarity index 100%
rename from samples/forty/pictures.bmp
rename to demos/forty/pictures.bmp
diff --git a/samples/forty/pictures.xpm b/demos/forty/pictures.xpm
similarity index 100%
rename from samples/forty/pictures.xpm
rename to demos/forty/pictures.xpm
diff --git a/samples/forty/pile.cpp b/demos/forty/pile.cpp
similarity index 100%
rename from samples/forty/pile.cpp
rename to demos/forty/pile.cpp
diff --git a/samples/forty/pile.h b/demos/forty/pile.h
similarity index 100%
rename from samples/forty/pile.h
rename to demos/forty/pile.h
diff --git a/samples/forty/playerdg.cpp b/demos/forty/playerdg.cpp
similarity index 100%
rename from samples/forty/playerdg.cpp
rename to demos/forty/playerdg.cpp
diff --git a/samples/forty/playerdg.h b/demos/forty/playerdg.h
similarity index 100%
rename from samples/forty/playerdg.h
rename to demos/forty/playerdg.h
diff --git a/samples/forty/readme.txt b/demos/forty/readme.txt
similarity index 100%
rename from samples/forty/readme.txt
rename to demos/forty/readme.txt
diff --git a/samples/forty/scoredg.cpp b/demos/forty/scoredg.cpp
similarity index 100%
rename from samples/forty/scoredg.cpp
rename to demos/forty/scoredg.cpp
diff --git a/samples/forty/scoredg.h b/demos/forty/scoredg.h
similarity index 100%
rename from samples/forty/scoredg.h
rename to demos/forty/scoredg.h
diff --git a/samples/forty/scorefil.cpp b/demos/forty/scorefil.cpp
similarity index 100%
rename from samples/forty/scorefil.cpp
rename to demos/forty/scorefil.cpp
diff --git a/samples/forty/scorefil.h b/demos/forty/scorefil.h
similarity index 100%
rename from samples/forty/scorefil.h
rename to demos/forty/scorefil.h
diff --git a/samples/forty/symbols.bmp b/demos/forty/symbols.bmp
similarity index 100%
rename from samples/forty/symbols.bmp
rename to demos/forty/symbols.bmp
diff --git a/samples/forty/symbols.xbm b/demos/forty/symbols.xbm
similarity index 100%
rename from samples/forty/symbols.xbm
rename to demos/forty/symbols.xbm
diff --git a/samples/forty/symbols.xpm b/demos/forty/symbols.xpm
similarity index 100%
rename from samples/forty/symbols.xpm
rename to demos/forty/symbols.xpm
diff --git a/samples/fractal/.cvsignore b/demos/fractal/.cvsignore
similarity index 100%
rename from samples/fractal/.cvsignore
rename to demos/fractal/.cvsignore
diff --git a/samples/fractal/Makefile.in b/demos/fractal/Makefile.in
similarity index 100%
rename from samples/fractal/Makefile.in
rename to demos/fractal/Makefile.in
diff --git a/samples/fractal/fractal.cpp b/demos/fractal/fractal.cpp
similarity index 100%
rename from samples/fractal/fractal.cpp
rename to demos/fractal/fractal.cpp
diff --git a/samples/fractal/fractal.def b/demos/fractal/fractal.def
similarity index 100%
rename from samples/fractal/fractal.def
rename to demos/fractal/fractal.def
diff --git a/samples/fractal/fractal.rc b/demos/fractal/fractal.rc
similarity index 100%
rename from samples/fractal/fractal.rc
rename to demos/fractal/fractal.rc
diff --git a/samples/fractal/makefile.b32 b/demos/fractal/makefile.b32
similarity index 100%
rename from samples/fractal/makefile.b32
rename to demos/fractal/makefile.b32
diff --git a/samples/fractal/makefile.bcc b/demos/fractal/makefile.bcc
similarity index 100%
rename from samples/fractal/makefile.bcc
rename to demos/fractal/makefile.bcc
diff --git a/samples/fractal/makefile.dos b/demos/fractal/makefile.dos
similarity index 100%
rename from samples/fractal/makefile.dos
rename to demos/fractal/makefile.dos
diff --git a/samples/fractal/makefile.g95 b/demos/fractal/makefile.g95
similarity index 100%
rename from samples/fractal/makefile.g95
rename to demos/fractal/makefile.g95
diff --git a/samples/fractal/makefile.unx b/demos/fractal/makefile.unx
similarity index 100%
rename from samples/fractal/makefile.unx
rename to demos/fractal/makefile.unx
diff --git a/samples/fractal/makefile.vc b/demos/fractal/makefile.vc
similarity index 100%
rename from samples/fractal/makefile.vc
rename to demos/fractal/makefile.vc
diff --git a/samples/fractal/makefile.wat b/demos/fractal/makefile.wat
similarity index 100%
rename from samples/fractal/makefile.wat
rename to demos/fractal/makefile.wat
diff --git a/samples/dde/mondrian.ico b/demos/fractal/mondrian.ico
similarity index 100%
rename from samples/dde/mondrian.ico
rename to demos/fractal/mondrian.ico
diff --git a/samples/life/Makefile.in b/demos/life/Makefile.in
similarity index 100%
rename from samples/life/Makefile.in
rename to demos/life/Makefile.in
diff --git a/samples/life/bitmaps/play.bmp b/demos/life/bitmaps/play.bmp
similarity index 100%
rename from samples/life/bitmaps/play.bmp
rename to demos/life/bitmaps/play.bmp
diff --git a/samples/life/bitmaps/play.xpm b/demos/life/bitmaps/play.xpm
similarity index 100%
rename from samples/life/bitmaps/play.xpm
rename to demos/life/bitmaps/play.xpm
diff --git a/samples/life/bitmaps/reset.bmp b/demos/life/bitmaps/reset.bmp
similarity index 100%
rename from samples/life/bitmaps/reset.bmp
rename to demos/life/bitmaps/reset.bmp
diff --git a/samples/life/bitmaps/reset.xpm b/demos/life/bitmaps/reset.xpm
similarity index 100%
rename from samples/life/bitmaps/reset.xpm
rename to demos/life/bitmaps/reset.xpm
diff --git a/samples/life/bitmaps/stop.bmp b/demos/life/bitmaps/stop.bmp
similarity index 100%
rename from samples/life/bitmaps/stop.bmp
rename to demos/life/bitmaps/stop.bmp
diff --git a/samples/life/bitmaps/stop.xpm b/demos/life/bitmaps/stop.xpm
similarity index 100%
rename from samples/life/bitmaps/stop.xpm
rename to demos/life/bitmaps/stop.xpm
diff --git a/samples/life/life.cpp b/demos/life/life.cpp
similarity index 100%
rename from samples/life/life.cpp
rename to demos/life/life.cpp
diff --git a/samples/life/life.def b/demos/life/life.def
similarity index 100%
rename from samples/life/life.def
rename to demos/life/life.def
diff --git a/samples/life/life.rc b/demos/life/life.rc
similarity index 100%
rename from samples/life/life.rc
rename to demos/life/life.rc
diff --git a/samples/life/makefile.b32 b/demos/life/makefile.b32
similarity index 100%
rename from samples/life/makefile.b32
rename to demos/life/makefile.b32
diff --git a/samples/life/makefile.bcc b/demos/life/makefile.bcc
similarity index 100%
rename from samples/life/makefile.bcc
rename to demos/life/makefile.bcc
diff --git a/samples/life/makefile.dos b/demos/life/makefile.dos
similarity index 100%
rename from samples/life/makefile.dos
rename to demos/life/makefile.dos
diff --git a/samples/life/makefile.g95 b/demos/life/makefile.g95
similarity index 100%
rename from samples/life/makefile.g95
rename to demos/life/makefile.g95
diff --git a/samples/life/makefile.unx b/demos/life/makefile.unx
similarity index 100%
rename from samples/life/makefile.unx
rename to demos/life/makefile.unx
diff --git a/samples/life/makefile.vc b/demos/life/makefile.vc
similarity index 100%
rename from samples/life/makefile.vc
rename to demos/life/makefile.vc
diff --git a/samples/life/makefile.wat b/demos/life/makefile.wat
similarity index 100%
rename from samples/life/makefile.wat
rename to demos/life/makefile.wat
diff --git a/samples/fractal/mondrian.ico b/demos/life/mondrian.ico
similarity index 100%
rename from samples/fractal/mondrian.ico
rename to demos/life/mondrian.ico
diff --git a/samples/dde/mondrian.xpm b/demos/life/mondrian.xpm
similarity index 100%
rename from samples/dde/mondrian.xpm
rename to demos/life/mondrian.xpm
diff --git a/samples/life/samples.inc b/demos/life/samples.inc
similarity index 100%
rename from samples/life/samples.inc
rename to demos/life/samples.inc
diff --git a/samples/wxpoem/.cvsignore b/demos/poem/.cvsignore
similarity index 100%
rename from samples/wxpoem/.cvsignore
rename to demos/poem/.cvsignore
diff --git a/samples/wxpoem/Makefile.in b/demos/poem/Makefile.in
similarity index 100%
rename from samples/wxpoem/Makefile.in
rename to demos/poem/Makefile.in
diff --git a/samples/wxpoem/corner1.ico b/demos/poem/corner1.ico
similarity index 100%
rename from samples/wxpoem/corner1.ico
rename to demos/poem/corner1.ico
diff --git a/samples/wxpoem/corner1.xpm b/demos/poem/corner1.xpm
similarity index 100%
rename from samples/wxpoem/corner1.xpm
rename to demos/poem/corner1.xpm
diff --git a/samples/wxpoem/corner2.ico b/demos/poem/corner2.ico
similarity index 100%
rename from samples/wxpoem/corner2.ico
rename to demos/poem/corner2.ico
diff --git a/samples/wxpoem/corner2.xpm b/demos/poem/corner2.xpm
similarity index 100%
rename from samples/wxpoem/corner2.xpm
rename to demos/poem/corner2.xpm
diff --git a/samples/wxpoem/corner3.ico b/demos/poem/corner3.ico
similarity index 100%
rename from samples/wxpoem/corner3.ico
rename to demos/poem/corner3.ico
diff --git a/samples/wxpoem/corner3.xpm b/demos/poem/corner3.xpm
similarity index 100%
rename from samples/wxpoem/corner3.xpm
rename to demos/poem/corner3.xpm
diff --git a/samples/wxpoem/corner4.ico b/demos/poem/corner4.ico
similarity index 100%
rename from samples/wxpoem/corner4.ico
rename to demos/poem/corner4.ico
diff --git a/samples/wxpoem/corner4.xpm b/demos/poem/corner4.xpm
similarity index 100%
rename from samples/wxpoem/corner4.xpm
rename to demos/poem/corner4.xpm
diff --git a/samples/wxpoem/makefile.b32 b/demos/poem/makefile.b32
similarity index 100%
rename from samples/wxpoem/makefile.b32
rename to demos/poem/makefile.b32
diff --git a/samples/wxpoem/makefile.bcc b/demos/poem/makefile.bcc
similarity index 100%
rename from samples/wxpoem/makefile.bcc
rename to demos/poem/makefile.bcc
diff --git a/samples/wxpoem/makefile.dos b/demos/poem/makefile.dos
similarity index 100%
rename from samples/wxpoem/makefile.dos
rename to demos/poem/makefile.dos
diff --git a/samples/wxpoem/makefile.g95 b/demos/poem/makefile.g95
similarity index 100%
rename from samples/wxpoem/makefile.g95
rename to demos/poem/makefile.g95
diff --git a/samples/wxpoem/makefile.vc b/demos/poem/makefile.vc
similarity index 100%
rename from samples/wxpoem/makefile.vc
rename to demos/poem/makefile.vc
diff --git a/samples/wxpoem/makefile.wat b/demos/poem/makefile.wat
similarity index 100%
rename from samples/wxpoem/makefile.wat
rename to demos/poem/makefile.wat
diff --git a/samples/wxpoem/wxpoem.cpp b/demos/poem/wxpoem.cpp
similarity index 100%
rename from samples/wxpoem/wxpoem.cpp
rename to demos/poem/wxpoem.cpp
diff --git a/samples/wxpoem/wxpoem.dat b/demos/poem/wxpoem.dat
similarity index 100%
rename from samples/wxpoem/wxpoem.dat
rename to demos/poem/wxpoem.dat
diff --git a/samples/wxpoem/wxpoem.def b/demos/poem/wxpoem.def
similarity index 100%
rename from samples/wxpoem/wxpoem.def
rename to demos/poem/wxpoem.def
diff --git a/samples/wxpoem/wxpoem.h b/demos/poem/wxpoem.h
similarity index 100%
rename from samples/wxpoem/wxpoem.h
rename to demos/poem/wxpoem.h
diff --git a/samples/wxpoem/wxpoem.ico b/demos/poem/wxpoem.ico
similarity index 100%
rename from samples/wxpoem/wxpoem.ico
rename to demos/poem/wxpoem.ico
diff --git a/demos/poem/wxpoem.idx b/demos/poem/wxpoem.idx
new file mode 100644
index 0000000000..0004670168
--- /dev/null
+++ b/demos/poem/wxpoem.idx
@@ -0,0 +1,137 @@
+135
+
+0
+432
+678
+849
+1000
+1289
+1676
+2036
+2695
+3247
+3839
+4214
+4444
+5002
+5705
+5943
+6559
+7236
+7935
+8387
+8826
+9065
+9712
+10030
+10251
+10488
+10879
+11165
+11541
+11679
+12341
+12952
+13601
+14037
+14685
+15355
+16023
+16480
+16789
+17472
+18104
+18634
+19160
+19828
+20450
+20892
+21651
+22144
+22697
+22863
+23105
+23495
+23659
+23858
+24027
+26188
+26375
+26605
+27170
+27341
+27752
+27912
+28100
+28298
+28493
+28705
+28919
+29336
+29969
+30491
+30876
+31495
+32918
+33373
+33703
+33830
+34045
+34223
+34477
+34889
+35367
+35760
+35898
+36461
+36950
+37417
+39079
+39455
+40104
+40787
+42555
+43641
+45010
+45571
+46287
+46870
+47331
+47808
+48457
+49704
+50924
+52070
+52830
+53582
+54076
+54328
+54590
+55064
+55453
+55643
+56256
+57048
+57698
+58621
+59337
+60780
+61314
+61518
+61825
+62104
+62315
+62462
+62980
+63167
+63748
+64581
+65034
+65343
+66368
+67140
+68358
+69033
+69732
+70434
+71096
diff --git a/samples/wxpoem/wxpoem.rc b/demos/poem/wxpoem.rc
similarity index 100%
rename from samples/wxpoem/wxpoem.rc
rename to demos/poem/wxpoem.rc
diff --git a/samples/wxpoem/wxpoem.txt b/demos/poem/wxpoem.txt
similarity index 100%
rename from samples/wxpoem/wxpoem.txt
rename to demos/poem/wxpoem.txt
diff --git a/samples/wxpoem/wxpoem.xpm b/demos/poem/wxpoem.xpm
similarity index 100%
rename from samples/wxpoem/wxpoem.xpm
rename to demos/poem/wxpoem.xpm
diff --git a/samples/nettest/Makefile.in b/samples/dialup/Makefile.in
similarity index 100%
rename from samples/nettest/Makefile.in
rename to samples/dialup/Makefile.in
diff --git a/samples/nettest/makefile.b32 b/samples/dialup/makefile.b32
similarity index 100%
rename from samples/nettest/makefile.b32
rename to samples/dialup/makefile.b32
diff --git a/samples/nettest/makefile.bcc b/samples/dialup/makefile.bcc
similarity index 100%
rename from samples/nettest/makefile.bcc
rename to samples/dialup/makefile.bcc
diff --git a/samples/nettest/makefile.dos b/samples/dialup/makefile.dos
similarity index 100%
rename from samples/nettest/makefile.dos
rename to samples/dialup/makefile.dos
diff --git a/samples/nettest/makefile.g95 b/samples/dialup/makefile.g95
similarity index 100%
rename from samples/nettest/makefile.g95
rename to samples/dialup/makefile.g95
diff --git a/samples/nettest/makefile.unx b/samples/dialup/makefile.unx
similarity index 100%
rename from samples/nettest/makefile.unx
rename to samples/dialup/makefile.unx
diff --git a/samples/nettest/makefile.vc b/samples/dialup/makefile.vc
similarity index 100%
rename from samples/nettest/makefile.vc
rename to samples/dialup/makefile.vc
diff --git a/samples/nettest/nettest.cpp b/samples/dialup/nettest.cpp
similarity index 100%
rename from samples/nettest/nettest.cpp
rename to samples/dialup/nettest.cpp
diff --git a/samples/nettest/nettest.def b/samples/dialup/nettest.def
similarity index 100%
rename from samples/nettest/nettest.def
rename to samples/dialup/nettest.def
diff --git a/samples/nettest/nettest.rc b/samples/dialup/nettest.rc
similarity index 100%
rename from samples/nettest/nettest.rc
rename to samples/dialup/nettest.rc
diff --git a/samples/dde/.cvsignore b/samples/ipc/.cvsignore
similarity index 100%
rename from samples/dde/.cvsignore
rename to samples/ipc/.cvsignore
diff --git a/samples/dde/client.cpp b/samples/ipc/client.cpp
similarity index 100%
rename from samples/dde/client.cpp
rename to samples/ipc/client.cpp
diff --git a/samples/dde/client.def b/samples/ipc/client.def
similarity index 100%
rename from samples/dde/client.def
rename to samples/ipc/client.def
diff --git a/samples/dde/client.g95 b/samples/ipc/client.g95
similarity index 100%
rename from samples/dde/client.g95
rename to samples/ipc/client.g95
diff --git a/samples/dde/client.h b/samples/ipc/client.h
similarity index 100%
rename from samples/dde/client.h
rename to samples/ipc/client.h
diff --git a/samples/dde/client.rc b/samples/ipc/client.rc
similarity index 100%
rename from samples/dde/client.rc
rename to samples/ipc/client.rc
diff --git a/samples/dde/client.vc b/samples/ipc/client.vc
similarity index 100%
rename from samples/dde/client.vc
rename to samples/ipc/client.vc
diff --git a/samples/dde/client.wat b/samples/ipc/client.wat
similarity index 100%
rename from samples/dde/client.wat
rename to samples/ipc/client.wat
diff --git a/samples/dde/ddesetup.h b/samples/ipc/ddesetup.h
similarity index 100%
rename from samples/dde/ddesetup.h
rename to samples/ipc/ddesetup.h
diff --git a/samples/dde/makefile.b32 b/samples/ipc/makefile.b32
similarity index 100%
rename from samples/dde/makefile.b32
rename to samples/ipc/makefile.b32
diff --git a/samples/dde/makefile.dos b/samples/ipc/makefile.dos
similarity index 100%
rename from samples/dde/makefile.dos
rename to samples/ipc/makefile.dos
diff --git a/samples/dde/makefile.g95 b/samples/ipc/makefile.g95
similarity index 100%
rename from samples/dde/makefile.g95
rename to samples/ipc/makefile.g95
diff --git a/samples/dde/makefile.vc b/samples/ipc/makefile.vc
similarity index 100%
rename from samples/dde/makefile.vc
rename to samples/ipc/makefile.vc
diff --git a/samples/life/mondrian.ico b/samples/ipc/mondrian.ico
similarity index 100%
rename from samples/life/mondrian.ico
rename to samples/ipc/mondrian.ico
diff --git a/samples/life/mondrian.xpm b/samples/ipc/mondrian.xpm
similarity index 100%
rename from samples/life/mondrian.xpm
rename to samples/ipc/mondrian.xpm
diff --git a/samples/dde/server.cpp b/samples/ipc/server.cpp
similarity index 100%
rename from samples/dde/server.cpp
rename to samples/ipc/server.cpp
diff --git a/samples/dde/server.def b/samples/ipc/server.def
similarity index 100%
rename from samples/dde/server.def
rename to samples/ipc/server.def
diff --git a/samples/dde/server.g95 b/samples/ipc/server.g95
similarity index 100%
rename from samples/dde/server.g95
rename to samples/ipc/server.g95
diff --git a/samples/dde/server.h b/samples/ipc/server.h
similarity index 100%
rename from samples/dde/server.h
rename to samples/ipc/server.h
diff --git a/samples/dde/server.rc b/samples/ipc/server.rc
similarity index 100%
rename from samples/dde/server.rc
rename to samples/ipc/server.rc
diff --git a/samples/dde/server.vc b/samples/ipc/server.vc
similarity index 100%
rename from samples/dde/server.vc
rename to samples/ipc/server.vc
diff --git a/samples/dde/server.wat b/samples/ipc/server.wat
similarity index 100%
rename from samples/dde/server.wat
rename to samples/ipc/server.wat
diff --git a/samples/wxsocket/.cvsignore b/samples/sockets/.cvsignore
similarity index 100%
rename from samples/wxsocket/.cvsignore
rename to samples/sockets/.cvsignore
diff --git a/samples/wxsocket/Makefile.in b/samples/sockets/Makefile.in
similarity index 100%
rename from samples/wxsocket/Makefile.in
rename to samples/sockets/Makefile.in
diff --git a/samples/wxsocket/client.cpp b/samples/sockets/client.cpp
similarity index 100%
rename from samples/wxsocket/client.cpp
rename to samples/sockets/client.cpp
diff --git a/samples/wxsocket/client.def b/samples/sockets/client.def
similarity index 100%
rename from samples/wxsocket/client.def
rename to samples/sockets/client.def
diff --git a/samples/wxsocket/client.g95 b/samples/sockets/client.g95
similarity index 100%
rename from samples/wxsocket/client.g95
rename to samples/sockets/client.g95
diff --git a/samples/wxsocket/client.rc b/samples/sockets/client.rc
similarity index 100%
rename from samples/wxsocket/client.rc
rename to samples/sockets/client.rc
diff --git a/samples/wxsocket/client.vc b/samples/sockets/client.vc
similarity index 100%
rename from samples/wxsocket/client.vc
rename to samples/sockets/client.vc
diff --git a/samples/wxsocket/client.wat b/samples/sockets/client.wat
similarity index 100%
rename from samples/wxsocket/client.wat
rename to samples/sockets/client.wat
diff --git a/samples/wxsocket/connect.ico b/samples/sockets/connect.ico
similarity index 100%
rename from samples/wxsocket/connect.ico
rename to samples/sockets/connect.ico
diff --git a/samples/wxsocket/makefile.b32 b/samples/sockets/makefile.b32
similarity index 100%
rename from samples/wxsocket/makefile.b32
rename to samples/sockets/makefile.b32
diff --git a/samples/wxsocket/makefile.dos b/samples/sockets/makefile.dos
similarity index 100%
rename from samples/wxsocket/makefile.dos
rename to samples/sockets/makefile.dos
diff --git a/samples/wxsocket/makefile.g95 b/samples/sockets/makefile.g95
similarity index 100%
rename from samples/wxsocket/makefile.g95
rename to samples/sockets/makefile.g95
diff --git a/samples/wxsocket/makefile.vc b/samples/sockets/makefile.vc
similarity index 100%
rename from samples/wxsocket/makefile.vc
rename to samples/sockets/makefile.vc
diff --git a/samples/wxsocket/mondrian.ico b/samples/sockets/mondrian.ico
similarity index 100%
rename from samples/wxsocket/mondrian.ico
rename to samples/sockets/mondrian.ico
diff --git a/samples/wxsocket/mondrian.xpm b/samples/sockets/mondrian.xpm
similarity index 100%
rename from samples/wxsocket/mondrian.xpm
rename to samples/sockets/mondrian.xpm
diff --git a/samples/wxsocket/server.cpp b/samples/sockets/server.cpp
similarity index 100%
rename from samples/wxsocket/server.cpp
rename to samples/sockets/server.cpp
diff --git a/samples/wxsocket/server.def b/samples/sockets/server.def
similarity index 100%
rename from samples/wxsocket/server.def
rename to samples/sockets/server.def
diff --git a/samples/wxsocket/server.g95 b/samples/sockets/server.g95
similarity index 100%
rename from samples/wxsocket/server.g95
rename to samples/sockets/server.g95
diff --git a/samples/wxsocket/server.rc b/samples/sockets/server.rc
similarity index 100%
rename from samples/wxsocket/server.rc
rename to samples/sockets/server.rc
diff --git a/samples/wxsocket/server.vc b/samples/sockets/server.vc
similarity index 100%
rename from samples/wxsocket/server.vc
rename to samples/sockets/server.vc
diff --git a/samples/wxsocket/server.wat b/samples/sockets/server.wat
similarity index 100%
rename from samples/wxsocket/server.wat
rename to samples/sockets/server.wat