diff --git a/interface/aboutdlg.h b/interface/wx/aboutdlg.h
similarity index 100%
rename from interface/aboutdlg.h
rename to interface/wx/aboutdlg.h
diff --git a/interface/accel.h b/interface/wx/accel.h
similarity index 100%
rename from interface/accel.h
rename to interface/wx/accel.h
diff --git a/interface/access.h b/interface/wx/access.h
similarity index 100%
rename from interface/access.h
rename to interface/wx/access.h
diff --git a/interface/animate.h b/interface/wx/animate.h
similarity index 100%
rename from interface/animate.h
rename to interface/wx/animate.h
diff --git a/interface/app.h b/interface/wx/app.h
similarity index 100%
rename from interface/app.h
rename to interface/wx/app.h
diff --git a/interface/apptrait.h b/interface/wx/apptrait.h
similarity index 100%
rename from interface/apptrait.h
rename to interface/wx/apptrait.h
diff --git a/interface/archive.h b/interface/wx/archive.h
similarity index 100%
rename from interface/archive.h
rename to interface/wx/archive.h
diff --git a/interface/arrstr.h b/interface/wx/arrstr.h
similarity index 100%
rename from interface/arrstr.h
rename to interface/wx/arrstr.h
diff --git a/interface/artprov.h b/interface/wx/artprov.h
similarity index 100%
rename from interface/artprov.h
rename to interface/wx/artprov.h
diff --git a/interface/atomic.h b/interface/wx/atomic.h
similarity index 100%
rename from interface/atomic.h
rename to interface/wx/atomic.h
diff --git a/interface/aui/auibook.h b/interface/wx/aui/auibook.h
similarity index 100%
rename from interface/aui/auibook.h
rename to interface/wx/aui/auibook.h
diff --git a/interface/aui/dockart.h b/interface/wx/aui/dockart.h
similarity index 100%
rename from interface/aui/dockart.h
rename to interface/wx/aui/dockart.h
diff --git a/interface/aui/framemanager.h b/interface/wx/aui/framemanager.h
similarity index 100%
rename from interface/aui/framemanager.h
rename to interface/wx/aui/framemanager.h
diff --git a/interface/base64.h b/interface/wx/base64.h
similarity index 100%
rename from interface/base64.h
rename to interface/wx/base64.h
diff --git a/interface/bitmap.h b/interface/wx/bitmap.h
similarity index 100%
rename from interface/bitmap.h
rename to interface/wx/bitmap.h
diff --git a/interface/bmpbuttn.h b/interface/wx/bmpbuttn.h
similarity index 100%
rename from interface/bmpbuttn.h
rename to interface/wx/bmpbuttn.h
diff --git a/interface/bmpcbox.h b/interface/wx/bmpcbox.h
similarity index 100%
rename from interface/bmpcbox.h
rename to interface/wx/bmpcbox.h
diff --git a/interface/bookctrl.h b/interface/wx/bookctrl.h
similarity index 100%
rename from interface/bookctrl.h
rename to interface/wx/bookctrl.h
diff --git a/interface/brush.h b/interface/wx/brush.h
similarity index 100%
rename from interface/brush.h
rename to interface/wx/brush.h
diff --git a/interface/buffer.h b/interface/wx/buffer.h
similarity index 100%
rename from interface/buffer.h
rename to interface/wx/buffer.h
diff --git a/interface/busyinfo.h b/interface/wx/busyinfo.h
similarity index 100%
rename from interface/busyinfo.h
rename to interface/wx/busyinfo.h
diff --git a/interface/button.h b/interface/wx/button.h
similarity index 100%
rename from interface/button.h
rename to interface/wx/button.h
diff --git a/interface/calctrl.h b/interface/wx/calctrl.h
similarity index 100%
rename from interface/calctrl.h
rename to interface/wx/calctrl.h
diff --git a/interface/caret.h b/interface/wx/caret.h
similarity index 100%
rename from interface/caret.h
rename to interface/wx/caret.h
diff --git a/interface/chartype.h b/interface/wx/chartype.h
similarity index 100%
rename from interface/chartype.h
rename to interface/wx/chartype.h
diff --git a/interface/checkbox.h b/interface/wx/checkbox.h
similarity index 100%
rename from interface/checkbox.h
rename to interface/wx/checkbox.h
diff --git a/interface/checklst.h b/interface/wx/checklst.h
similarity index 100%
rename from interface/checklst.h
rename to interface/wx/checklst.h
diff --git a/interface/choicdlg.h b/interface/wx/choicdlg.h
similarity index 100%
rename from interface/choicdlg.h
rename to interface/wx/choicdlg.h
diff --git a/interface/choice.h b/interface/wx/choice.h
similarity index 100%
rename from interface/choice.h
rename to interface/wx/choice.h
diff --git a/interface/choicebk.h b/interface/wx/choicebk.h
similarity index 100%
rename from interface/choicebk.h
rename to interface/wx/choicebk.h
diff --git a/interface/clipbrd.h b/interface/wx/clipbrd.h
similarity index 100%
rename from interface/clipbrd.h
rename to interface/wx/clipbrd.h
diff --git a/interface/clntdata.h b/interface/wx/clntdata.h
similarity index 100%
rename from interface/clntdata.h
rename to interface/wx/clntdata.h
diff --git a/interface/clrpicker.h b/interface/wx/clrpicker.h
similarity index 100%
rename from interface/clrpicker.h
rename to interface/wx/clrpicker.h
diff --git a/interface/cmdline.h b/interface/wx/cmdline.h
similarity index 100%
rename from interface/cmdline.h
rename to interface/wx/cmdline.h
diff --git a/interface/cmdproc.h b/interface/wx/cmdproc.h
similarity index 100%
rename from interface/cmdproc.h
rename to interface/wx/cmdproc.h
diff --git a/interface/cmndata.h b/interface/wx/cmndata.h
similarity index 100%
rename from interface/cmndata.h
rename to interface/wx/cmndata.h
diff --git a/interface/collpane.h b/interface/wx/collpane.h
similarity index 100%
rename from interface/collpane.h
rename to interface/wx/collpane.h
diff --git a/interface/colordlg.h b/interface/wx/colordlg.h
similarity index 100%
rename from interface/colordlg.h
rename to interface/wx/colordlg.h
diff --git a/interface/colour.h b/interface/wx/colour.h
similarity index 100%
rename from interface/colour.h
rename to interface/wx/colour.h
diff --git a/interface/combo.h b/interface/wx/combo.h
similarity index 100%
rename from interface/combo.h
rename to interface/wx/combo.h
diff --git a/interface/combobox.h b/interface/wx/combobox.h
similarity index 100%
rename from interface/combobox.h
rename to interface/wx/combobox.h
diff --git a/interface/config.h b/interface/wx/config.h
similarity index 100%
rename from interface/config.h
rename to interface/wx/config.h
diff --git a/interface/control.h b/interface/wx/control.h
similarity index 100%
rename from interface/control.h
rename to interface/wx/control.h
diff --git a/interface/convauto.h b/interface/wx/convauto.h
similarity index 100%
rename from interface/convauto.h
rename to interface/wx/convauto.h
diff --git a/interface/cpp.h b/interface/wx/cpp.h
similarity index 100%
rename from interface/cpp.h
rename to interface/wx/cpp.h
diff --git a/interface/cshelp.h b/interface/wx/cshelp.h
similarity index 100%
rename from interface/cshelp.h
rename to interface/wx/cshelp.h
diff --git a/interface/ctrlsub.h b/interface/wx/ctrlsub.h
similarity index 100%
rename from interface/ctrlsub.h
rename to interface/wx/ctrlsub.h
diff --git a/interface/cursor.h b/interface/wx/cursor.h
similarity index 100%
rename from interface/cursor.h
rename to interface/wx/cursor.h
diff --git a/interface/dataobj.h b/interface/wx/dataobj.h
similarity index 100%
rename from interface/dataobj.h
rename to interface/wx/dataobj.h
diff --git a/interface/dataview.h b/interface/wx/dataview.h
similarity index 100%
rename from interface/dataview.h
rename to interface/wx/dataview.h
diff --git a/interface/datectrl.h b/interface/wx/datectrl.h
similarity index 100%
rename from interface/datectrl.h
rename to interface/wx/datectrl.h
diff --git a/interface/dateevt.h b/interface/wx/dateevt.h
similarity index 100%
rename from interface/dateevt.h
rename to interface/wx/dateevt.h
diff --git a/interface/datetime.h b/interface/wx/datetime.h
similarity index 100%
rename from interface/datetime.h
rename to interface/wx/datetime.h
diff --git a/interface/datstrm.h b/interface/wx/datstrm.h
similarity index 100%
rename from interface/datstrm.h
rename to interface/wx/datstrm.h
diff --git a/interface/dc.h b/interface/wx/dc.h
similarity index 100%
rename from interface/dc.h
rename to interface/wx/dc.h
diff --git a/interface/dcbuffer.h b/interface/wx/dcbuffer.h
similarity index 100%
rename from interface/dcbuffer.h
rename to interface/wx/dcbuffer.h
diff --git a/interface/dcclient.h b/interface/wx/dcclient.h
similarity index 100%
rename from interface/dcclient.h
rename to interface/wx/dcclient.h
diff --git a/interface/dcgraph.h b/interface/wx/dcgraph.h
similarity index 100%
rename from interface/dcgraph.h
rename to interface/wx/dcgraph.h
diff --git a/interface/dcmemory.h b/interface/wx/dcmemory.h
similarity index 100%
rename from interface/dcmemory.h
rename to interface/wx/dcmemory.h
diff --git a/interface/dcmirror.h b/interface/wx/dcmirror.h
similarity index 100%
rename from interface/dcmirror.h
rename to interface/wx/dcmirror.h
diff --git a/interface/dcprint.h b/interface/wx/dcprint.h
similarity index 100%
rename from interface/dcprint.h
rename to interface/wx/dcprint.h
diff --git a/interface/dcps.h b/interface/wx/dcps.h
similarity index 100%
rename from interface/dcps.h
rename to interface/wx/dcps.h
diff --git a/interface/dcscreen.h b/interface/wx/dcscreen.h
similarity index 100%
rename from interface/dcscreen.h
rename to interface/wx/dcscreen.h
diff --git a/interface/dcsvg.h b/interface/wx/dcsvg.h
similarity index 100%
rename from interface/dcsvg.h
rename to interface/wx/dcsvg.h
diff --git a/interface/dde.h b/interface/wx/dde.h
similarity index 100%
rename from interface/dde.h
rename to interface/wx/dde.h
diff --git a/interface/debug.h b/interface/wx/debug.h
similarity index 100%
rename from interface/debug.h
rename to interface/wx/debug.h
diff --git a/interface/debugrpt.h b/interface/wx/debugrpt.h
similarity index 100%
rename from interface/debugrpt.h
rename to interface/wx/debugrpt.h
diff --git a/interface/defs.h b/interface/wx/defs.h
similarity index 100%
rename from interface/defs.h
rename to interface/wx/defs.h
diff --git a/interface/dialog.h b/interface/wx/dialog.h
similarity index 100%
rename from interface/dialog.h
rename to interface/wx/dialog.h
diff --git a/interface/dialup.h b/interface/wx/dialup.h
similarity index 100%
rename from interface/dialup.h
rename to interface/wx/dialup.h
diff --git a/interface/dir.h b/interface/wx/dir.h
similarity index 100%
rename from interface/dir.h
rename to interface/wx/dir.h
diff --git a/interface/dirctrl.h b/interface/wx/dirctrl.h
similarity index 100%
rename from interface/dirctrl.h
rename to interface/wx/dirctrl.h
diff --git a/interface/dirdlg.h b/interface/wx/dirdlg.h
similarity index 100%
rename from interface/dirdlg.h
rename to interface/wx/dirdlg.h
diff --git a/interface/display.h b/interface/wx/display.h
similarity index 100%
rename from interface/display.h
rename to interface/wx/display.h
diff --git a/interface/dnd.h b/interface/wx/dnd.h
similarity index 100%
rename from interface/dnd.h
rename to interface/wx/dnd.h
diff --git a/interface/docmdi.h b/interface/wx/docmdi.h
similarity index 100%
rename from interface/docmdi.h
rename to interface/wx/docmdi.h
diff --git a/interface/docview.h b/interface/wx/docview.h
similarity index 100%
rename from interface/docview.h
rename to interface/wx/docview.h
diff --git a/interface/dragimag.h b/interface/wx/dragimag.h
similarity index 100%
rename from interface/dragimag.h
rename to interface/wx/dragimag.h
diff --git a/interface/dynarray.h b/interface/wx/dynarray.h
similarity index 100%
rename from interface/dynarray.h
rename to interface/wx/dynarray.h
diff --git a/interface/dynlib.h b/interface/wx/dynlib.h
similarity index 100%
rename from interface/dynlib.h
rename to interface/wx/dynlib.h
diff --git a/interface/editlbox.h b/interface/wx/editlbox.h
similarity index 100%
rename from interface/editlbox.h
rename to interface/wx/editlbox.h
diff --git a/interface/encconv.h b/interface/wx/encconv.h
similarity index 100%
rename from interface/encconv.h
rename to interface/wx/encconv.h
diff --git a/interface/event.h b/interface/wx/event.h
similarity index 100%
rename from interface/event.h
rename to interface/wx/event.h
diff --git a/interface/fdrepdlg.h b/interface/wx/fdrepdlg.h
similarity index 100%
rename from interface/fdrepdlg.h
rename to interface/wx/fdrepdlg.h
diff --git a/interface/ffile.h b/interface/wx/ffile.h
similarity index 100%
rename from interface/ffile.h
rename to interface/wx/ffile.h
diff --git a/interface/file.h b/interface/wx/file.h
similarity index 100%
rename from interface/file.h
rename to interface/wx/file.h
diff --git a/interface/fileconf.h b/interface/wx/fileconf.h
similarity index 100%
rename from interface/fileconf.h
rename to interface/wx/fileconf.h
diff --git a/interface/filectrl.h b/interface/wx/filectrl.h
similarity index 100%
rename from interface/filectrl.h
rename to interface/wx/filectrl.h
diff --git a/interface/filedlg.h b/interface/wx/filedlg.h
similarity index 100%
rename from interface/filedlg.h
rename to interface/wx/filedlg.h
diff --git a/interface/filefn.h b/interface/wx/filefn.h
similarity index 100%
rename from interface/filefn.h
rename to interface/wx/filefn.h
diff --git a/interface/filename.h b/interface/wx/filename.h
similarity index 100%
rename from interface/filename.h
rename to interface/wx/filename.h
diff --git a/interface/filepicker.h b/interface/wx/filepicker.h
similarity index 100%
rename from interface/filepicker.h
rename to interface/wx/filepicker.h
diff --git a/interface/filesys.h b/interface/wx/filesys.h
similarity index 100%
rename from interface/filesys.h
rename to interface/wx/filesys.h
diff --git a/interface/font.h b/interface/wx/font.h
similarity index 100%
rename from interface/font.h
rename to interface/wx/font.h
diff --git a/interface/fontdlg.h b/interface/wx/fontdlg.h
similarity index 100%
rename from interface/fontdlg.h
rename to interface/wx/fontdlg.h
diff --git a/interface/fontenum.h b/interface/wx/fontenum.h
similarity index 100%
rename from interface/fontenum.h
rename to interface/wx/fontenum.h
diff --git a/interface/fontmap.h b/interface/wx/fontmap.h
similarity index 100%
rename from interface/fontmap.h
rename to interface/wx/fontmap.h
diff --git a/interface/fontpicker.h b/interface/wx/fontpicker.h
similarity index 100%
rename from interface/fontpicker.h
rename to interface/wx/fontpicker.h
diff --git a/interface/frame.h b/interface/wx/frame.h
similarity index 100%
rename from interface/frame.h
rename to interface/wx/frame.h
diff --git a/interface/fs_mem.h b/interface/wx/fs_mem.h
similarity index 100%
rename from interface/fs_mem.h
rename to interface/wx/fs_mem.h
diff --git a/interface/gauge.h b/interface/wx/gauge.h
similarity index 100%
rename from interface/gauge.h
rename to interface/wx/gauge.h
diff --git a/interface/gbsizer.h b/interface/wx/gbsizer.h
similarity index 100%
rename from interface/gbsizer.h
rename to interface/wx/gbsizer.h
diff --git a/interface/gdicmn.h b/interface/wx/gdicmn.h
similarity index 100%
rename from interface/gdicmn.h
rename to interface/wx/gdicmn.h
diff --git a/interface/gdiobj.h b/interface/wx/gdiobj.h
similarity index 100%
rename from interface/gdiobj.h
rename to interface/wx/gdiobj.h
diff --git a/interface/generic/helpext.h b/interface/wx/generic/helpext.h
similarity index 100%
rename from interface/generic/helpext.h
rename to interface/wx/generic/helpext.h
diff --git a/interface/glcanvas.h b/interface/wx/glcanvas.h
similarity index 100%
rename from interface/glcanvas.h
rename to interface/wx/glcanvas.h
diff --git a/interface/graphics.h b/interface/wx/graphics.h
similarity index 100%
rename from interface/graphics.h
rename to interface/wx/graphics.h
diff --git a/interface/grid.h b/interface/wx/grid.h
similarity index 100%
rename from interface/grid.h
rename to interface/wx/grid.h
diff --git a/interface/hash.h b/interface/wx/hash.h
similarity index 100%
rename from interface/hash.h
rename to interface/wx/hash.h
diff --git a/interface/hashmap.h b/interface/wx/hashmap.h
similarity index 100%
rename from interface/hashmap.h
rename to interface/wx/hashmap.h
diff --git a/interface/hashset.h b/interface/wx/hashset.h
similarity index 100%
rename from interface/hashset.h
rename to interface/wx/hashset.h
diff --git a/interface/help.h b/interface/wx/help.h
similarity index 100%
rename from interface/help.h
rename to interface/wx/help.h
diff --git a/interface/html/helpctrl.h b/interface/wx/html/helpctrl.h
similarity index 100%
rename from interface/html/helpctrl.h
rename to interface/wx/html/helpctrl.h
diff --git a/interface/html/helpdata.h b/interface/wx/html/helpdata.h
similarity index 100%
rename from interface/html/helpdata.h
rename to interface/wx/html/helpdata.h
diff --git a/interface/html/helpdlg.h b/interface/wx/html/helpdlg.h
similarity index 100%
rename from interface/html/helpdlg.h
rename to interface/wx/html/helpdlg.h
diff --git a/interface/html/helpfrm.h b/interface/wx/html/helpfrm.h
similarity index 100%
rename from interface/html/helpfrm.h
rename to interface/wx/html/helpfrm.h
diff --git a/interface/html/helpwnd.h b/interface/wx/html/helpwnd.h
similarity index 100%
rename from interface/html/helpwnd.h
rename to interface/wx/html/helpwnd.h
diff --git a/interface/html/htmlcell.h b/interface/wx/html/htmlcell.h
similarity index 100%
rename from interface/html/htmlcell.h
rename to interface/wx/html/htmlcell.h
diff --git a/interface/html/htmlfilt.h b/interface/wx/html/htmlfilt.h
similarity index 100%
rename from interface/html/htmlfilt.h
rename to interface/wx/html/htmlfilt.h
diff --git a/interface/html/htmlpars.h b/interface/wx/html/htmlpars.h
similarity index 100%
rename from interface/html/htmlpars.h
rename to interface/wx/html/htmlpars.h
diff --git a/interface/html/htmltag.h b/interface/wx/html/htmltag.h
similarity index 100%
rename from interface/html/htmltag.h
rename to interface/wx/html/htmltag.h
diff --git a/interface/html/htmlwin.h b/interface/wx/html/htmlwin.h
similarity index 100%
rename from interface/html/htmlwin.h
rename to interface/wx/html/htmlwin.h
diff --git a/interface/html/htmprint.h b/interface/wx/html/htmprint.h
similarity index 100%
rename from interface/html/htmprint.h
rename to interface/wx/html/htmprint.h
diff --git a/interface/html/winpars.h b/interface/wx/html/winpars.h
similarity index 100%
rename from interface/html/winpars.h
rename to interface/wx/html/winpars.h
diff --git a/interface/htmllbox.h b/interface/wx/htmllbox.h
similarity index 100%
rename from interface/htmllbox.h
rename to interface/wx/htmllbox.h
diff --git a/interface/hyperlink.h b/interface/wx/hyperlink.h
similarity index 100%
rename from interface/hyperlink.h
rename to interface/wx/hyperlink.h
diff --git a/interface/icon.h b/interface/wx/icon.h
similarity index 100%
rename from interface/icon.h
rename to interface/wx/icon.h
diff --git a/interface/iconbndl.h b/interface/wx/iconbndl.h
similarity index 100%
rename from interface/iconbndl.h
rename to interface/wx/iconbndl.h
diff --git a/interface/iconloc.h b/interface/wx/iconloc.h
similarity index 100%
rename from interface/iconloc.h
rename to interface/wx/iconloc.h
diff --git a/interface/image.h b/interface/wx/image.h
similarity index 100%
rename from interface/image.h
rename to interface/wx/image.h
diff --git a/interface/imaglist.h b/interface/wx/imaglist.h
similarity index 100%
rename from interface/imaglist.h
rename to interface/wx/imaglist.h
diff --git a/interface/init.h b/interface/wx/init.h
similarity index 100%
rename from interface/init.h
rename to interface/wx/init.h
diff --git a/interface/intl.h b/interface/wx/intl.h
similarity index 100%
rename from interface/intl.h
rename to interface/wx/intl.h
diff --git a/interface/ipc.h b/interface/wx/ipc.h
similarity index 100%
rename from interface/ipc.h
rename to interface/wx/ipc.h
diff --git a/interface/ipcbase.h b/interface/wx/ipcbase.h
similarity index 100%
rename from interface/ipcbase.h
rename to interface/wx/ipcbase.h
diff --git a/interface/joystick.h b/interface/wx/joystick.h
similarity index 100%
rename from interface/joystick.h
rename to interface/wx/joystick.h
diff --git a/interface/laywin.h b/interface/wx/laywin.h
similarity index 100%
rename from interface/laywin.h
rename to interface/wx/laywin.h
diff --git a/interface/link.h b/interface/wx/link.h
similarity index 100%
rename from interface/link.h
rename to interface/wx/link.h
diff --git a/interface/list.h b/interface/wx/list.h
similarity index 100%
rename from interface/list.h
rename to interface/wx/list.h
diff --git a/interface/listbook.h b/interface/wx/listbook.h
similarity index 100%
rename from interface/listbook.h
rename to interface/wx/listbook.h
diff --git a/interface/listbox.h b/interface/wx/listbox.h
similarity index 100%
rename from interface/listbox.h
rename to interface/wx/listbox.h
diff --git a/interface/listctrl.h b/interface/wx/listctrl.h
similarity index 100%
rename from interface/listctrl.h
rename to interface/wx/listctrl.h
diff --git a/interface/log.h b/interface/wx/log.h
similarity index 100%
rename from interface/log.h
rename to interface/wx/log.h
diff --git a/interface/longlong.h b/interface/wx/longlong.h
similarity index 100%
rename from interface/longlong.h
rename to interface/wx/longlong.h
diff --git a/interface/math.h b/interface/wx/math.h
similarity index 100%
rename from interface/math.h
rename to interface/wx/math.h
diff --git a/interface/mdi.h b/interface/wx/mdi.h
similarity index 100%
rename from interface/mdi.h
rename to interface/wx/mdi.h
diff --git a/interface/mediactrl.h b/interface/wx/mediactrl.h
similarity index 100%
rename from interface/mediactrl.h
rename to interface/wx/mediactrl.h
diff --git a/interface/memory.h b/interface/wx/memory.h
similarity index 100%
rename from interface/memory.h
rename to interface/wx/memory.h
diff --git a/interface/menu.h b/interface/wx/menu.h
similarity index 100%
rename from interface/menu.h
rename to interface/wx/menu.h
diff --git a/interface/menuitem.h b/interface/wx/menuitem.h
similarity index 100%
rename from interface/menuitem.h
rename to interface/wx/menuitem.h
diff --git a/interface/metafile.h b/interface/wx/metafile.h
similarity index 100%
rename from interface/metafile.h
rename to interface/wx/metafile.h
diff --git a/interface/mimetype.h b/interface/wx/mimetype.h
similarity index 100%
rename from interface/mimetype.h
rename to interface/wx/mimetype.h
diff --git a/interface/minifram.h b/interface/wx/minifram.h
similarity index 100%
rename from interface/minifram.h
rename to interface/wx/minifram.h
diff --git a/interface/module.h b/interface/wx/module.h
similarity index 100%
rename from interface/module.h
rename to interface/wx/module.h
diff --git a/interface/msgdlg.h b/interface/wx/msgdlg.h
similarity index 100%
rename from interface/msgdlg.h
rename to interface/wx/msgdlg.h
diff --git a/interface/msgqueue.h b/interface/wx/msgqueue.h
similarity index 100%
rename from interface/msgqueue.h
rename to interface/wx/msgqueue.h
diff --git a/interface/mstream.h b/interface/wx/mstream.h
similarity index 100%
rename from interface/mstream.h
rename to interface/wx/mstream.h
diff --git a/interface/msw/ole/activex.h b/interface/wx/msw/ole/activex.h
similarity index 100%
rename from interface/msw/ole/activex.h
rename to interface/wx/msw/ole/activex.h
diff --git a/interface/msw/ole/automtn.h b/interface/wx/msw/ole/automtn.h
similarity index 100%
rename from interface/msw/ole/automtn.h
rename to interface/wx/msw/ole/automtn.h
diff --git a/interface/msw/registry.h b/interface/wx/msw/registry.h
similarity index 100%
rename from interface/msw/registry.h
rename to interface/wx/msw/registry.h
diff --git a/interface/notebook.h b/interface/wx/notebook.h
similarity index 100%
rename from interface/notebook.h
rename to interface/wx/notebook.h
diff --git a/interface/notifmsg.h b/interface/wx/notifmsg.h
similarity index 100%
rename from interface/notifmsg.h
rename to interface/wx/notifmsg.h
diff --git a/interface/numdlg.h b/interface/wx/numdlg.h
similarity index 100%
rename from interface/numdlg.h
rename to interface/wx/numdlg.h
diff --git a/interface/object.h b/interface/wx/object.h
similarity index 100%
rename from interface/object.h
rename to interface/wx/object.h
diff --git a/interface/odcombo.h b/interface/wx/odcombo.h
similarity index 100%
rename from interface/odcombo.h
rename to interface/wx/odcombo.h
diff --git a/interface/palette.h b/interface/wx/palette.h
similarity index 100%
rename from interface/palette.h
rename to interface/wx/palette.h
diff --git a/interface/panel.h b/interface/wx/panel.h
similarity index 100%
rename from interface/panel.h
rename to interface/wx/panel.h
diff --git a/interface/pen.h b/interface/wx/pen.h
similarity index 100%
rename from interface/pen.h
rename to interface/wx/pen.h
diff --git a/interface/pickerbase.h b/interface/wx/pickerbase.h
similarity index 100%
rename from interface/pickerbase.h
rename to interface/wx/pickerbase.h
diff --git a/interface/platform.h b/interface/wx/platform.h
similarity index 100%
rename from interface/platform.h
rename to interface/wx/platform.h
diff --git a/interface/platinfo.h b/interface/wx/platinfo.h
similarity index 100%
rename from interface/platinfo.h
rename to interface/wx/platinfo.h
diff --git a/interface/popupwin.h b/interface/wx/popupwin.h
similarity index 100%
rename from interface/popupwin.h
rename to interface/wx/popupwin.h
diff --git a/interface/position.h b/interface/wx/position.h
similarity index 100%
rename from interface/position.h
rename to interface/wx/position.h
diff --git a/interface/power.h b/interface/wx/power.h
similarity index 100%
rename from interface/power.h
rename to interface/wx/power.h
diff --git a/interface/print.h b/interface/wx/print.h
similarity index 100%
rename from interface/print.h
rename to interface/wx/print.h
diff --git a/interface/printdlg.h b/interface/wx/printdlg.h
similarity index 100%
rename from interface/printdlg.h
rename to interface/wx/printdlg.h
diff --git a/interface/process.h b/interface/wx/process.h
similarity index 100%
rename from interface/process.h
rename to interface/wx/process.h
diff --git a/interface/progdlg.h b/interface/wx/progdlg.h
similarity index 100%
rename from interface/progdlg.h
rename to interface/wx/progdlg.h
diff --git a/interface/propdlg.h b/interface/wx/propdlg.h
similarity index 100%
rename from interface/propdlg.h
rename to interface/wx/propdlg.h
diff --git a/interface/protocol/ftp.h b/interface/wx/protocol/ftp.h
similarity index 100%
rename from interface/protocol/ftp.h
rename to interface/wx/protocol/ftp.h
diff --git a/interface/protocol/http.h b/interface/wx/protocol/http.h
similarity index 100%
rename from interface/protocol/http.h
rename to interface/wx/protocol/http.h
diff --git a/interface/protocol/protocol.h b/interface/wx/protocol/protocol.h
similarity index 100%
rename from interface/protocol/protocol.h
rename to interface/wx/protocol/protocol.h
diff --git a/interface/ptr_scpd.h b/interface/wx/ptr_scpd.h
similarity index 100%
rename from interface/ptr_scpd.h
rename to interface/wx/ptr_scpd.h
diff --git a/interface/ptr_shrd.h b/interface/wx/ptr_shrd.h
similarity index 100%
rename from interface/ptr_shrd.h
rename to interface/wx/ptr_shrd.h
diff --git a/interface/quantize.h b/interface/wx/quantize.h
similarity index 100%
rename from interface/quantize.h
rename to interface/wx/quantize.h
diff --git a/interface/radiobox.h b/interface/wx/radiobox.h
similarity index 100%
rename from interface/radiobox.h
rename to interface/wx/radiobox.h
diff --git a/interface/radiobut.h b/interface/wx/radiobut.h
similarity index 100%
rename from interface/radiobut.h
rename to interface/wx/radiobut.h
diff --git a/interface/rawbmp.h b/interface/wx/rawbmp.h
similarity index 100%
rename from interface/rawbmp.h
rename to interface/wx/rawbmp.h
diff --git a/interface/recguard.h b/interface/wx/recguard.h
similarity index 100%
rename from interface/recguard.h
rename to interface/wx/recguard.h
diff --git a/interface/regex.h b/interface/wx/regex.h
similarity index 100%
rename from interface/regex.h
rename to interface/wx/regex.h
diff --git a/interface/region.h b/interface/wx/region.h
similarity index 100%
rename from interface/region.h
rename to interface/wx/region.h
diff --git a/interface/renderer.h b/interface/wx/renderer.h
similarity index 100%
rename from interface/renderer.h
rename to interface/wx/renderer.h
diff --git a/interface/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h
similarity index 100%
rename from interface/richtext/richtextbuffer.h
rename to interface/wx/richtext/richtextbuffer.h
diff --git a/interface/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h
similarity index 100%
rename from interface/richtext/richtextctrl.h
rename to interface/wx/richtext/richtextctrl.h
diff --git a/interface/richtext/richtextformatdlg.h b/interface/wx/richtext/richtextformatdlg.h
similarity index 100%
rename from interface/richtext/richtextformatdlg.h
rename to interface/wx/richtext/richtextformatdlg.h
diff --git a/interface/richtext/richtexthtml.h b/interface/wx/richtext/richtexthtml.h
similarity index 100%
rename from interface/richtext/richtexthtml.h
rename to interface/wx/richtext/richtexthtml.h
diff --git a/interface/richtext/richtextprint.h b/interface/wx/richtext/richtextprint.h
similarity index 100%
rename from interface/richtext/richtextprint.h
rename to interface/wx/richtext/richtextprint.h
diff --git a/interface/richtext/richtextstyledlg.h b/interface/wx/richtext/richtextstyledlg.h
similarity index 100%
rename from interface/richtext/richtextstyledlg.h
rename to interface/wx/richtext/richtextstyledlg.h
diff --git a/interface/richtext/richtextstyles.h b/interface/wx/richtext/richtextstyles.h
similarity index 100%
rename from interface/richtext/richtextstyles.h
rename to interface/wx/richtext/richtextstyles.h
diff --git a/interface/richtext/richtextsymboldlg.h b/interface/wx/richtext/richtextsymboldlg.h
similarity index 100%
rename from interface/richtext/richtextsymboldlg.h
rename to interface/wx/richtext/richtextsymboldlg.h
diff --git a/interface/richtext/richtextxml.h b/interface/wx/richtext/richtextxml.h
similarity index 100%
rename from interface/richtext/richtextxml.h
rename to interface/wx/richtext/richtextxml.h
diff --git a/interface/sashwin.h b/interface/wx/sashwin.h
similarity index 100%
rename from interface/sashwin.h
rename to interface/wx/sashwin.h
diff --git a/interface/sckipc.h b/interface/wx/sckipc.h
similarity index 100%
rename from interface/sckipc.h
rename to interface/wx/sckipc.h
diff --git a/interface/sckstrm.h b/interface/wx/sckstrm.h
similarity index 100%
rename from interface/sckstrm.h
rename to interface/wx/sckstrm.h
diff --git a/interface/scopeguard.h b/interface/wx/scopeguard.h
similarity index 100%
rename from interface/scopeguard.h
rename to interface/wx/scopeguard.h
diff --git a/interface/scrolbar.h b/interface/wx/scrolbar.h
similarity index 100%
rename from interface/scrolbar.h
rename to interface/wx/scrolbar.h
diff --git a/interface/scrolwin.h b/interface/wx/scrolwin.h
similarity index 100%
rename from interface/scrolwin.h
rename to interface/wx/scrolwin.h
diff --git a/interface/settings.h b/interface/wx/settings.h
similarity index 100%
rename from interface/settings.h
rename to interface/wx/settings.h
diff --git a/interface/sizer.h b/interface/wx/sizer.h
similarity index 100%
rename from interface/sizer.h
rename to interface/wx/sizer.h
diff --git a/interface/slider.h b/interface/wx/slider.h
similarity index 100%
rename from interface/slider.h
rename to interface/wx/slider.h
diff --git a/interface/snglinst.h b/interface/wx/snglinst.h
similarity index 100%
rename from interface/snglinst.h
rename to interface/wx/snglinst.h
diff --git a/interface/socket.h b/interface/wx/socket.h
similarity index 100%
rename from interface/socket.h
rename to interface/wx/socket.h
diff --git a/interface/sound.h b/interface/wx/sound.h
similarity index 100%
rename from interface/sound.h
rename to interface/wx/sound.h
diff --git a/interface/spinbutt.h b/interface/wx/spinbutt.h
similarity index 100%
rename from interface/spinbutt.h
rename to interface/wx/spinbutt.h
diff --git a/interface/spinctrl.h b/interface/wx/spinctrl.h
similarity index 100%
rename from interface/spinctrl.h
rename to interface/wx/spinctrl.h
diff --git a/interface/splash.h b/interface/wx/splash.h
similarity index 100%
rename from interface/splash.h
rename to interface/wx/splash.h
diff --git a/interface/splitter.h b/interface/wx/splitter.h
similarity index 100%
rename from interface/splitter.h
rename to interface/wx/splitter.h
diff --git a/interface/srchctrl.h b/interface/wx/srchctrl.h
similarity index 100%
rename from interface/srchctrl.h
rename to interface/wx/srchctrl.h
diff --git a/interface/sstream.h b/interface/wx/sstream.h
similarity index 100%
rename from interface/sstream.h
rename to interface/wx/sstream.h
diff --git a/interface/stackwalk.h b/interface/wx/stackwalk.h
similarity index 100%
rename from interface/stackwalk.h
rename to interface/wx/stackwalk.h
diff --git a/interface/statbmp.h b/interface/wx/statbmp.h
similarity index 100%
rename from interface/statbmp.h
rename to interface/wx/statbmp.h
diff --git a/interface/statbox.h b/interface/wx/statbox.h
similarity index 100%
rename from interface/statbox.h
rename to interface/wx/statbox.h
diff --git a/interface/statline.h b/interface/wx/statline.h
similarity index 100%
rename from interface/statline.h
rename to interface/wx/statline.h
diff --git a/interface/stattext.h b/interface/wx/stattext.h
similarity index 100%
rename from interface/stattext.h
rename to interface/wx/stattext.h
diff --git a/interface/statusbr.h b/interface/wx/statusbr.h
similarity index 100%
rename from interface/statusbr.h
rename to interface/wx/statusbr.h
diff --git a/interface/stc/stc.h b/interface/wx/stc/stc.h
similarity index 100%
rename from interface/stc/stc.h
rename to interface/wx/stc/stc.h
diff --git a/interface/stdpaths.h b/interface/wx/stdpaths.h
similarity index 100%
rename from interface/stdpaths.h
rename to interface/wx/stdpaths.h
diff --git a/interface/stockitem.h b/interface/wx/stockitem.h
similarity index 100%
rename from interface/stockitem.h
rename to interface/wx/stockitem.h
diff --git a/interface/stopwatch.h b/interface/wx/stopwatch.h
similarity index 100%
rename from interface/stopwatch.h
rename to interface/wx/stopwatch.h
diff --git a/interface/strconv.h b/interface/wx/strconv.h
similarity index 100%
rename from interface/strconv.h
rename to interface/wx/strconv.h
diff --git a/interface/stream.h b/interface/wx/stream.h
similarity index 100%
rename from interface/stream.h
rename to interface/wx/stream.h
diff --git a/interface/string.h b/interface/wx/string.h
similarity index 100%
rename from interface/string.h
rename to interface/wx/string.h
diff --git a/interface/sysopt.h b/interface/wx/sysopt.h
similarity index 100%
rename from interface/sysopt.h
rename to interface/wx/sysopt.h
diff --git a/interface/tarstrm.h b/interface/wx/tarstrm.h
similarity index 100%
rename from interface/tarstrm.h
rename to interface/wx/tarstrm.h
diff --git a/interface/taskbar.h b/interface/wx/taskbar.h
similarity index 100%
rename from interface/taskbar.h
rename to interface/wx/taskbar.h
diff --git a/interface/textctrl.h b/interface/wx/textctrl.h
similarity index 100%
rename from interface/textctrl.h
rename to interface/wx/textctrl.h
diff --git a/interface/textdlg.h b/interface/wx/textdlg.h
similarity index 100%
rename from interface/textdlg.h
rename to interface/wx/textdlg.h
diff --git a/interface/textfile.h b/interface/wx/textfile.h
similarity index 100%
rename from interface/textfile.h
rename to interface/wx/textfile.h
diff --git a/interface/tglbtn.h b/interface/wx/tglbtn.h
similarity index 100%
rename from interface/tglbtn.h
rename to interface/wx/tglbtn.h
diff --git a/interface/thread.h b/interface/wx/thread.h
similarity index 100%
rename from interface/thread.h
rename to interface/wx/thread.h
diff --git a/interface/timer.h b/interface/wx/timer.h
similarity index 100%
rename from interface/timer.h
rename to interface/wx/timer.h
diff --git a/interface/tipdlg.h b/interface/wx/tipdlg.h
similarity index 100%
rename from interface/tipdlg.h
rename to interface/wx/tipdlg.h
diff --git a/interface/tipwin.h b/interface/wx/tipwin.h
similarity index 100%
rename from interface/tipwin.h
rename to interface/wx/tipwin.h
diff --git a/interface/tokenzr.h b/interface/wx/tokenzr.h
similarity index 100%
rename from interface/tokenzr.h
rename to interface/wx/tokenzr.h
diff --git a/interface/toolbar.h b/interface/wx/toolbar.h
similarity index 100%
rename from interface/toolbar.h
rename to interface/wx/toolbar.h
diff --git a/interface/toolbook.h b/interface/wx/toolbook.h
similarity index 100%
rename from interface/toolbook.h
rename to interface/wx/toolbook.h
diff --git a/interface/tooltip.h b/interface/wx/tooltip.h
similarity index 100%
rename from interface/tooltip.h
rename to interface/wx/tooltip.h
diff --git a/interface/toplevel.h b/interface/wx/toplevel.h
similarity index 100%
rename from interface/toplevel.h
rename to interface/wx/toplevel.h
diff --git a/interface/tracker.h b/interface/wx/tracker.h
similarity index 100%
rename from interface/tracker.h
rename to interface/wx/tracker.h
diff --git a/interface/treebase.h b/interface/wx/treebase.h
similarity index 100%
rename from interface/treebase.h
rename to interface/wx/treebase.h
diff --git a/interface/treebook.h b/interface/wx/treebook.h
similarity index 100%
rename from interface/treebook.h
rename to interface/wx/treebook.h
diff --git a/interface/treectrl.h b/interface/wx/treectrl.h
similarity index 100%
rename from interface/treectrl.h
rename to interface/wx/treectrl.h
diff --git a/interface/txtstrm.h b/interface/wx/txtstrm.h
similarity index 100%
rename from interface/txtstrm.h
rename to interface/wx/txtstrm.h
diff --git a/interface/uri.h b/interface/wx/uri.h
similarity index 100%
rename from interface/uri.h
rename to interface/wx/uri.h
diff --git a/interface/url.h b/interface/wx/url.h
similarity index 100%
rename from interface/url.h
rename to interface/wx/url.h
diff --git a/interface/utils.h b/interface/wx/utils.h
similarity index 100%
rename from interface/utils.h
rename to interface/wx/utils.h
diff --git a/interface/valgen.h b/interface/wx/valgen.h
similarity index 100%
rename from interface/valgen.h
rename to interface/wx/valgen.h
diff --git a/interface/validate.h b/interface/wx/validate.h
similarity index 100%
rename from interface/validate.h
rename to interface/wx/validate.h
diff --git a/interface/valtext.h b/interface/wx/valtext.h
similarity index 100%
rename from interface/valtext.h
rename to interface/wx/valtext.h
diff --git a/interface/variant.h b/interface/wx/variant.h
similarity index 100%
rename from interface/variant.h
rename to interface/wx/variant.h
diff --git a/interface/vector.h b/interface/wx/vector.h
similarity index 100%
rename from interface/vector.h
rename to interface/wx/vector.h
diff --git a/interface/version.h b/interface/wx/version.h
similarity index 100%
rename from interface/version.h
rename to interface/wx/version.h
diff --git a/interface/vidmode.h b/interface/wx/vidmode.h
similarity index 100%
rename from interface/vidmode.h
rename to interface/wx/vidmode.h
diff --git a/interface/vlbox.h b/interface/wx/vlbox.h
similarity index 100%
rename from interface/vlbox.h
rename to interface/wx/vlbox.h
diff --git a/interface/vscroll.h b/interface/wx/vscroll.h
similarity index 100%
rename from interface/vscroll.h
rename to interface/wx/vscroll.h
diff --git a/interface/weakref.h b/interface/wx/weakref.h
similarity index 100%
rename from interface/weakref.h
rename to interface/wx/weakref.h
diff --git a/interface/wfstream.h b/interface/wx/wfstream.h
similarity index 100%
rename from interface/wfstream.h
rename to interface/wx/wfstream.h
diff --git a/interface/window.h b/interface/wx/window.h
similarity index 100%
rename from interface/window.h
rename to interface/wx/window.h
diff --git a/interface/windowid.h b/interface/wx/windowid.h
similarity index 100%
rename from interface/windowid.h
rename to interface/wx/windowid.h
diff --git a/interface/wizard.h b/interface/wx/wizard.h
similarity index 100%
rename from interface/wizard.h
rename to interface/wx/wizard.h
diff --git a/interface/wrapsizer.h b/interface/wx/wrapsizer.h
similarity index 100%
rename from interface/wrapsizer.h
rename to interface/wx/wrapsizer.h
diff --git a/interface/wupdlock.h b/interface/wx/wupdlock.h
similarity index 100%
rename from interface/wupdlock.h
rename to interface/wx/wupdlock.h
diff --git a/interface/wxcrt.h b/interface/wx/wxcrt.h
similarity index 100%
rename from interface/wxcrt.h
rename to interface/wx/wxcrt.h
diff --git a/interface/xml/xml.h b/interface/wx/xml/xml.h
similarity index 100%
rename from interface/xml/xml.h
rename to interface/wx/xml/xml.h
diff --git a/interface/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
similarity index 100%
rename from interface/xrc/xmlres.h
rename to interface/wx/xrc/xmlres.h
diff --git a/interface/zipstrm.h b/interface/wx/zipstrm.h
similarity index 100%
rename from interface/zipstrm.h
rename to interface/wx/zipstrm.h
diff --git a/interface/zstream.h b/interface/wx/zstream.h
similarity index 100%
rename from interface/zstream.h
rename to interface/wx/zstream.h