diff --git a/deleteme.txt b/deleteme.txt
deleted file mode 100644
index 955c91917..000000000
--- a/deleteme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Delete me
diff --git a/ChangeLog.txt b/graphics/NxWidgets/ChangeLog.txt
similarity index 100%
rename from ChangeLog.txt
rename to graphics/NxWidgets/ChangeLog.txt
diff --git a/Doxygen/Doxyfile b/graphics/NxWidgets/Doxygen/Doxyfile
similarity index 100%
rename from Doxygen/Doxyfile
rename to graphics/NxWidgets/Doxygen/Doxyfile
diff --git a/Doxygen/README.txt b/graphics/NxWidgets/Doxygen/README.txt
similarity index 100%
rename from Doxygen/README.txt
rename to graphics/NxWidgets/Doxygen/README.txt
diff --git a/Doxygen/gendoc.sh b/graphics/NxWidgets/Doxygen/gendoc.sh
similarity index 100%
rename from Doxygen/gendoc.sh
rename to graphics/NxWidgets/Doxygen/gendoc.sh
diff --git a/Kconfig b/graphics/NxWidgets/Kconfig
similarity index 100%
rename from Kconfig
rename to graphics/NxWidgets/Kconfig
diff --git a/README.txt b/graphics/NxWidgets/README.txt
similarity index 100%
rename from README.txt
rename to graphics/NxWidgets/README.txt
diff --git a/ReleaseNotes.txt b/graphics/NxWidgets/ReleaseNotes.txt
similarity index 100%
rename from ReleaseNotes.txt
rename to graphics/NxWidgets/ReleaseNotes.txt
diff --git a/TODO.txt b/graphics/NxWidgets/TODO.txt
similarity index 100%
rename from TODO.txt
rename to graphics/NxWidgets/TODO.txt
diff --git a/UnitTests/CButton/.gitignore b/graphics/NxWidgets/UnitTests/CButton/.gitignore
similarity index 100%
rename from UnitTests/CButton/.gitignore
rename to graphics/NxWidgets/UnitTests/CButton/.gitignore
diff --git a/UnitTests/CButton/Make.defs b/graphics/NxWidgets/UnitTests/CButton/Make.defs
similarity index 100%
rename from UnitTests/CButton/Make.defs
rename to graphics/NxWidgets/UnitTests/CButton/Make.defs
diff --git a/UnitTests/CButton/Makefile b/graphics/NxWidgets/UnitTests/CButton/Makefile
similarity index 100%
rename from UnitTests/CButton/Makefile
rename to graphics/NxWidgets/UnitTests/CButton/Makefile
diff --git a/UnitTests/CButton/cbutton-pushed.png b/graphics/NxWidgets/UnitTests/CButton/cbutton-pushed.png
similarity index 100%
rename from UnitTests/CButton/cbutton-pushed.png
rename to graphics/NxWidgets/UnitTests/CButton/cbutton-pushed.png
diff --git a/UnitTests/CButton/cbutton-released.png b/graphics/NxWidgets/UnitTests/CButton/cbutton-released.png
similarity index 100%
rename from UnitTests/CButton/cbutton-released.png
rename to graphics/NxWidgets/UnitTests/CButton/cbutton-released.png
diff --git a/UnitTests/CButton/cbutton_main.cxx b/graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx
similarity index 100%
rename from UnitTests/CButton/cbutton_main.cxx
rename to graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx
diff --git a/UnitTests/CButton/cbuttontest.cxx b/graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx
similarity index 100%
rename from UnitTests/CButton/cbuttontest.cxx
rename to graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx
diff --git a/UnitTests/CButton/cbuttontest.hxx b/graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx
similarity index 100%
rename from UnitTests/CButton/cbuttontest.hxx
rename to graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx
diff --git a/UnitTests/CButtonArray/.gitignore b/graphics/NxWidgets/UnitTests/CButtonArray/.gitignore
similarity index 100%
rename from UnitTests/CButtonArray/.gitignore
rename to graphics/NxWidgets/UnitTests/CButtonArray/.gitignore
diff --git a/UnitTests/CButtonArray/Make.defs b/graphics/NxWidgets/UnitTests/CButtonArray/Make.defs
similarity index 100%
rename from UnitTests/CButtonArray/Make.defs
rename to graphics/NxWidgets/UnitTests/CButtonArray/Make.defs
diff --git a/UnitTests/CButtonArray/Makefile b/graphics/NxWidgets/UnitTests/CButtonArray/Makefile
similarity index 100%
rename from UnitTests/CButtonArray/Makefile
rename to graphics/NxWidgets/UnitTests/CButtonArray/Makefile
diff --git a/UnitTests/CButtonArray/cbuttonarray.png b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray.png
similarity index 100%
rename from UnitTests/CButtonArray/cbuttonarray.png
rename to graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray.png
diff --git a/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
similarity index 100%
rename from UnitTests/CButtonArray/cbuttonarray_main.cxx
rename to graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
diff --git a/UnitTests/CButtonArray/cbuttonarraytest.cxx b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
similarity index 100%
rename from UnitTests/CButtonArray/cbuttonarraytest.cxx
rename to graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
diff --git a/UnitTests/CButtonArray/cbuttonarraytest.hxx b/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
similarity index 100%
rename from UnitTests/CButtonArray/cbuttonarraytest.hxx
rename to graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
diff --git a/UnitTests/CCheckBox/.gitignore b/graphics/NxWidgets/UnitTests/CCheckBox/.gitignore
similarity index 100%
rename from UnitTests/CCheckBox/.gitignore
rename to graphics/NxWidgets/UnitTests/CCheckBox/.gitignore
diff --git a/UnitTests/CCheckBox/Make.defs b/graphics/NxWidgets/UnitTests/CCheckBox/Make.defs
similarity index 100%
rename from UnitTests/CCheckBox/Make.defs
rename to graphics/NxWidgets/UnitTests/CCheckBox/Make.defs
diff --git a/UnitTests/CCheckBox/Makefile b/graphics/NxWidgets/UnitTests/CCheckBox/Makefile
similarity index 100%
rename from UnitTests/CCheckBox/Makefile
rename to graphics/NxWidgets/UnitTests/CCheckBox/Makefile
diff --git a/UnitTests/CCheckBox/ccheckbox.png b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox.png
similarity index 100%
rename from UnitTests/CCheckBox/ccheckbox.png
rename to graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox.png
diff --git a/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
similarity index 100%
rename from UnitTests/CCheckBox/ccheckbox_main.cxx
rename to graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
diff --git a/UnitTests/CCheckBox/ccheckboxtest.cxx b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
similarity index 100%
rename from UnitTests/CCheckBox/ccheckboxtest.cxx
rename to graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
diff --git a/UnitTests/CCheckBox/ccheckboxtest.hxx b/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
similarity index 100%
rename from UnitTests/CCheckBox/ccheckboxtest.hxx
rename to graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
diff --git a/UnitTests/CGlyphButton/.gitignore b/graphics/NxWidgets/UnitTests/CGlyphButton/.gitignore
similarity index 100%
rename from UnitTests/CGlyphButton/.gitignore
rename to graphics/NxWidgets/UnitTests/CGlyphButton/.gitignore
diff --git a/UnitTests/CGlyphButton/Make.defs b/graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs
similarity index 100%
rename from UnitTests/CGlyphButton/Make.defs
rename to graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs
diff --git a/UnitTests/CGlyphButton/Makefile b/graphics/NxWidgets/UnitTests/CGlyphButton/Makefile
similarity index 100%
rename from UnitTests/CGlyphButton/Makefile
rename to graphics/NxWidgets/UnitTests/CGlyphButton/Makefile
diff --git a/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
similarity index 100%
rename from UnitTests/CGlyphButton/cglyphbutton_main.cxx
rename to graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
diff --git a/UnitTests/CGlyphButton/cglyphbuttontest.cxx b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
similarity index 100%
rename from UnitTests/CGlyphButton/cglyphbuttontest.cxx
rename to graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
diff --git a/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
similarity index 100%
rename from UnitTests/CGlyphButton/cglyphbuttontest.hxx
rename to graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
diff --git a/UnitTests/CGlyphSliderHorizontal/.gitignore b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore
similarity index 100%
rename from UnitTests/CGlyphSliderHorizontal/.gitignore
rename to graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore
diff --git a/UnitTests/CGlyphSliderHorizontal/Make.defs b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
similarity index 100%
rename from UnitTests/CGlyphSliderHorizontal/Make.defs
rename to graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
diff --git a/UnitTests/CGlyphSliderHorizontal/Makefile b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile
similarity index 100%
rename from UnitTests/CGlyphSliderHorizontal/Makefile
rename to graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile
diff --git a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
similarity index 100%
rename from UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
rename to graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
diff --git a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
similarity index 100%
rename from UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
rename to graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
diff --git a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
similarity index 100%
rename from UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
rename to graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
diff --git a/UnitTests/CImage/.gitignore b/graphics/NxWidgets/UnitTests/CImage/.gitignore
similarity index 100%
rename from UnitTests/CImage/.gitignore
rename to graphics/NxWidgets/UnitTests/CImage/.gitignore
diff --git a/UnitTests/CImage/Make.defs b/graphics/NxWidgets/UnitTests/CImage/Make.defs
similarity index 100%
rename from UnitTests/CImage/Make.defs
rename to graphics/NxWidgets/UnitTests/CImage/Make.defs
diff --git a/UnitTests/CImage/Makefile b/graphics/NxWidgets/UnitTests/CImage/Makefile
similarity index 100%
rename from UnitTests/CImage/Makefile
rename to graphics/NxWidgets/UnitTests/CImage/Makefile
diff --git a/UnitTests/CImage/cimage_main.cxx b/graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx
similarity index 100%
rename from UnitTests/CImage/cimage_main.cxx
rename to graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx
diff --git a/UnitTests/CImage/cimagetest.cxx b/graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx
similarity index 100%
rename from UnitTests/CImage/cimagetest.cxx
rename to graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx
diff --git a/UnitTests/CImage/cimagetest.hxx b/graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx
similarity index 100%
rename from UnitTests/CImage/cimagetest.hxx
rename to graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx
diff --git a/UnitTests/CKeypad/.gitignore b/graphics/NxWidgets/UnitTests/CKeypad/.gitignore
similarity index 100%
rename from UnitTests/CKeypad/.gitignore
rename to graphics/NxWidgets/UnitTests/CKeypad/.gitignore
diff --git a/UnitTests/CKeypad/Make.defs b/graphics/NxWidgets/UnitTests/CKeypad/Make.defs
similarity index 100%
rename from UnitTests/CKeypad/Make.defs
rename to graphics/NxWidgets/UnitTests/CKeypad/Make.defs
diff --git a/UnitTests/CKeypad/Makefile b/graphics/NxWidgets/UnitTests/CKeypad/Makefile
similarity index 100%
rename from UnitTests/CKeypad/Makefile
rename to graphics/NxWidgets/UnitTests/CKeypad/Makefile
diff --git a/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx
similarity index 100%
rename from UnitTests/CKeypad/ckeypad_main.cxx
rename to graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx
diff --git a/UnitTests/CKeypad/ckeypadtest.cxx b/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx
similarity index 100%
rename from UnitTests/CKeypad/ckeypadtest.cxx
rename to graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx
diff --git a/UnitTests/CKeypad/ckeypadtest.hxx b/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx
similarity index 100%
rename from UnitTests/CKeypad/ckeypadtest.hxx
rename to graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx
diff --git a/UnitTests/CLabel/.gitignore b/graphics/NxWidgets/UnitTests/CLabel/.gitignore
similarity index 100%
rename from UnitTests/CLabel/.gitignore
rename to graphics/NxWidgets/UnitTests/CLabel/.gitignore
diff --git a/UnitTests/CLabel/Make.defs b/graphics/NxWidgets/UnitTests/CLabel/Make.defs
similarity index 100%
rename from UnitTests/CLabel/Make.defs
rename to graphics/NxWidgets/UnitTests/CLabel/Make.defs
diff --git a/UnitTests/CLabel/Makefile b/graphics/NxWidgets/UnitTests/CLabel/Makefile
similarity index 100%
rename from UnitTests/CLabel/Makefile
rename to graphics/NxWidgets/UnitTests/CLabel/Makefile
diff --git a/UnitTests/CLabel/clabel.png b/graphics/NxWidgets/UnitTests/CLabel/clabel.png
similarity index 100%
rename from UnitTests/CLabel/clabel.png
rename to graphics/NxWidgets/UnitTests/CLabel/clabel.png
diff --git a/UnitTests/CLabel/clabel_main.cxx b/graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx
similarity index 100%
rename from UnitTests/CLabel/clabel_main.cxx
rename to graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx
diff --git a/UnitTests/CLabel/clabeltest.cxx b/graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx
similarity index 100%
rename from UnitTests/CLabel/clabeltest.cxx
rename to graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx
diff --git a/UnitTests/CLabel/clabeltest.hxx b/graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx
similarity index 100%
rename from UnitTests/CLabel/clabeltest.hxx
rename to graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx
diff --git a/UnitTests/CLatchButton/.gitignore b/graphics/NxWidgets/UnitTests/CLatchButton/.gitignore
similarity index 100%
rename from UnitTests/CLatchButton/.gitignore
rename to graphics/NxWidgets/UnitTests/CLatchButton/.gitignore
diff --git a/UnitTests/CLatchButton/Make.defs b/graphics/NxWidgets/UnitTests/CLatchButton/Make.defs
similarity index 100%
rename from UnitTests/CLatchButton/Make.defs
rename to graphics/NxWidgets/UnitTests/CLatchButton/Make.defs
diff --git a/UnitTests/CLatchButton/Makefile b/graphics/NxWidgets/UnitTests/CLatchButton/Makefile
similarity index 100%
rename from UnitTests/CLatchButton/Makefile
rename to graphics/NxWidgets/UnitTests/CLatchButton/Makefile
diff --git a/UnitTests/CLatchButton/clatchbutton_main.cxx b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
similarity index 100%
rename from UnitTests/CLatchButton/clatchbutton_main.cxx
rename to graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
diff --git a/UnitTests/CLatchButton/clatchbuttontest.cxx b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
similarity index 100%
rename from UnitTests/CLatchButton/clatchbuttontest.cxx
rename to graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
diff --git a/UnitTests/CLatchButton/clatchbuttontest.hxx b/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
similarity index 100%
rename from UnitTests/CLatchButton/clatchbuttontest.hxx
rename to graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
diff --git a/UnitTests/CLatchButtonArray/.gitignore b/graphics/NxWidgets/UnitTests/CLatchButtonArray/.gitignore
similarity index 100%
rename from UnitTests/CLatchButtonArray/.gitignore
rename to graphics/NxWidgets/UnitTests/CLatchButtonArray/.gitignore
diff --git a/UnitTests/CLatchButtonArray/Make.defs b/graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs
similarity index 100%
rename from UnitTests/CLatchButtonArray/Make.defs
rename to graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs
diff --git a/UnitTests/CLatchButtonArray/Makefile b/graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile
similarity index 100%
rename from UnitTests/CLatchButtonArray/Makefile
rename to graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile
diff --git a/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
similarity index 100%
rename from UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
rename to graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
diff --git a/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
similarity index 100%
rename from UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
rename to graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
diff --git a/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
similarity index 100%
rename from UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
rename to graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
diff --git a/UnitTests/CListBox/.gitignore b/graphics/NxWidgets/UnitTests/CListBox/.gitignore
similarity index 100%
rename from UnitTests/CListBox/.gitignore
rename to graphics/NxWidgets/UnitTests/CListBox/.gitignore
diff --git a/UnitTests/CListBox/Make.defs b/graphics/NxWidgets/UnitTests/CListBox/Make.defs
similarity index 100%
rename from UnitTests/CListBox/Make.defs
rename to graphics/NxWidgets/UnitTests/CListBox/Make.defs
diff --git a/UnitTests/CListBox/Makefile b/graphics/NxWidgets/UnitTests/CListBox/Makefile
similarity index 100%
rename from UnitTests/CListBox/Makefile
rename to graphics/NxWidgets/UnitTests/CListBox/Makefile
diff --git a/UnitTests/CListBox/clistbox_main.cxx b/graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx
similarity index 100%
rename from UnitTests/CListBox/clistbox_main.cxx
rename to graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx
diff --git a/UnitTests/CListBox/clistboxtest.cxx b/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx
similarity index 100%
rename from UnitTests/CListBox/clistboxtest.cxx
rename to graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx
diff --git a/UnitTests/CListBox/clistboxtest.hxx b/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx
similarity index 100%
rename from UnitTests/CListBox/clistboxtest.hxx
rename to graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx
diff --git a/UnitTests/CProgressBar/.gitignore b/graphics/NxWidgets/UnitTests/CProgressBar/.gitignore
similarity index 100%
rename from UnitTests/CProgressBar/.gitignore
rename to graphics/NxWidgets/UnitTests/CProgressBar/.gitignore
diff --git a/UnitTests/CProgressBar/Make.defs b/graphics/NxWidgets/UnitTests/CProgressBar/Make.defs
similarity index 100%
rename from UnitTests/CProgressBar/Make.defs
rename to graphics/NxWidgets/UnitTests/CProgressBar/Make.defs
diff --git a/UnitTests/CProgressBar/Makefile b/graphics/NxWidgets/UnitTests/CProgressBar/Makefile
similarity index 100%
rename from UnitTests/CProgressBar/Makefile
rename to graphics/NxWidgets/UnitTests/CProgressBar/Makefile
diff --git a/UnitTests/CProgressBar/cprogressbar.png b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar.png
similarity index 100%
rename from UnitTests/CProgressBar/cprogressbar.png
rename to graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar.png
diff --git a/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
similarity index 100%
rename from UnitTests/CProgressBar/cprogressbar_main.cxx
rename to graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
diff --git a/UnitTests/CProgressBar/cprogressbartest.cxx b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx
similarity index 100%
rename from UnitTests/CProgressBar/cprogressbartest.cxx
rename to graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx
diff --git a/UnitTests/CProgressBar/cprogressbartest.hxx b/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx
similarity index 100%
rename from UnitTests/CProgressBar/cprogressbartest.hxx
rename to graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx
diff --git a/UnitTests/CRadioButton/.gitignore b/graphics/NxWidgets/UnitTests/CRadioButton/.gitignore
similarity index 100%
rename from UnitTests/CRadioButton/.gitignore
rename to graphics/NxWidgets/UnitTests/CRadioButton/.gitignore
diff --git a/UnitTests/CRadioButton/Make.defs b/graphics/NxWidgets/UnitTests/CRadioButton/Make.defs
similarity index 100%
rename from UnitTests/CRadioButton/Make.defs
rename to graphics/NxWidgets/UnitTests/CRadioButton/Make.defs
diff --git a/UnitTests/CRadioButton/Makefile b/graphics/NxWidgets/UnitTests/CRadioButton/Makefile
similarity index 100%
rename from UnitTests/CRadioButton/Makefile
rename to graphics/NxWidgets/UnitTests/CRadioButton/Makefile
diff --git a/UnitTests/CRadioButton/cradiobutton.png b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton.png
similarity index 100%
rename from UnitTests/CRadioButton/cradiobutton.png
rename to graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton.png
diff --git a/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
similarity index 100%
rename from UnitTests/CRadioButton/cradiobutton_main.cxx
rename to graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
diff --git a/UnitTests/CRadioButton/cradiobuttontest.cxx b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
similarity index 100%
rename from UnitTests/CRadioButton/cradiobuttontest.cxx
rename to graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
diff --git a/UnitTests/CRadioButton/cradiobuttontest.hxx b/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
similarity index 100%
rename from UnitTests/CRadioButton/cradiobuttontest.hxx
rename to graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
diff --git a/UnitTests/CScrollbarHorizontal/.gitignore b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/.gitignore
similarity index 100%
rename from UnitTests/CScrollbarHorizontal/.gitignore
rename to graphics/NxWidgets/UnitTests/CScrollbarHorizontal/.gitignore
diff --git a/UnitTests/CScrollbarHorizontal/Make.defs b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs
similarity index 100%
rename from UnitTests/CScrollbarHorizontal/Make.defs
rename to graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs
diff --git a/UnitTests/CScrollbarHorizontal/Makefile b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile
similarity index 100%
rename from UnitTests/CScrollbarHorizontal/Makefile
rename to graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile
diff --git a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png
similarity index 100%
rename from UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png
rename to graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png
diff --git a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
similarity index 100%
rename from UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
rename to graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
diff --git a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
similarity index 100%
rename from UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
rename to graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
diff --git a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
similarity index 100%
rename from UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
rename to graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
diff --git a/UnitTests/CScrollbarVertical/.gitignore b/graphics/NxWidgets/UnitTests/CScrollbarVertical/.gitignore
similarity index 100%
rename from UnitTests/CScrollbarVertical/.gitignore
rename to graphics/NxWidgets/UnitTests/CScrollbarVertical/.gitignore
diff --git a/UnitTests/CScrollbarVertical/Make.defs b/graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs
similarity index 100%
rename from UnitTests/CScrollbarVertical/Make.defs
rename to graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs
diff --git a/UnitTests/CScrollbarVertical/Makefile b/graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile
similarity index 100%
rename from UnitTests/CScrollbarVertical/Makefile
rename to graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile
diff --git a/UnitTests/CScrollbarVertical/cscrollbarvertical.png b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical.png
similarity index 100%
rename from UnitTests/CScrollbarVertical/cscrollbarvertical.png
rename to graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical.png
diff --git a/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
similarity index 100%
rename from UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
rename to graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
diff --git a/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
similarity index 100%
rename from UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
rename to graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
diff --git a/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
similarity index 100%
rename from UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
rename to graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
diff --git a/UnitTests/CSliderHorizonal/.gitignore b/graphics/NxWidgets/UnitTests/CSliderHorizonal/.gitignore
similarity index 100%
rename from UnitTests/CSliderHorizonal/.gitignore
rename to graphics/NxWidgets/UnitTests/CSliderHorizonal/.gitignore
diff --git a/UnitTests/CSliderHorizonal/Make.defs b/graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs
similarity index 100%
rename from UnitTests/CSliderHorizonal/Make.defs
rename to graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs
diff --git a/UnitTests/CSliderHorizonal/Makefile b/graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile
similarity index 100%
rename from UnitTests/CSliderHorizonal/Makefile
rename to graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile
diff --git a/UnitTests/CSliderHorizonal/csliderhorizontal.png b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal.png
similarity index 100%
rename from UnitTests/CSliderHorizonal/csliderhorizontal.png
rename to graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal.png
diff --git a/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
similarity index 100%
rename from UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
rename to graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
diff --git a/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
similarity index 100%
rename from UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
rename to graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
diff --git a/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
similarity index 100%
rename from UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
rename to graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
diff --git a/UnitTests/CSliderVertical/.gitignore b/graphics/NxWidgets/UnitTests/CSliderVertical/.gitignore
similarity index 100%
rename from UnitTests/CSliderVertical/.gitignore
rename to graphics/NxWidgets/UnitTests/CSliderVertical/.gitignore
diff --git a/UnitTests/CSliderVertical/Make.defs b/graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs
similarity index 100%
rename from UnitTests/CSliderVertical/Make.defs
rename to graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs
diff --git a/UnitTests/CSliderVertical/Makefile b/graphics/NxWidgets/UnitTests/CSliderVertical/Makefile
similarity index 100%
rename from UnitTests/CSliderVertical/Makefile
rename to graphics/NxWidgets/UnitTests/CSliderVertical/Makefile
diff --git a/UnitTests/CSliderVertical/cslidervertical.png b/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical.png
similarity index 100%
rename from UnitTests/CSliderVertical/cslidervertical.png
rename to graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical.png
diff --git a/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
similarity index 100%
rename from UnitTests/CSliderVertical/cslidervertical_main.cxx
rename to graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
diff --git a/UnitTests/CSliderVertical/csliderverticaltest.cxx b/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
similarity index 100%
rename from UnitTests/CSliderVertical/csliderverticaltest.cxx
rename to graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
diff --git a/UnitTests/CSliderVertical/csliderverticaltest.hxx b/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
similarity index 100%
rename from UnitTests/CSliderVertical/csliderverticaltest.hxx
rename to graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
diff --git a/UnitTests/CTextBox/.gitignore b/graphics/NxWidgets/UnitTests/CTextBox/.gitignore
similarity index 100%
rename from UnitTests/CTextBox/.gitignore
rename to graphics/NxWidgets/UnitTests/CTextBox/.gitignore
diff --git a/UnitTests/CTextBox/Make.defs b/graphics/NxWidgets/UnitTests/CTextBox/Make.defs
similarity index 100%
rename from UnitTests/CTextBox/Make.defs
rename to graphics/NxWidgets/UnitTests/CTextBox/Make.defs
diff --git a/UnitTests/CTextBox/Makefile b/graphics/NxWidgets/UnitTests/CTextBox/Makefile
similarity index 100%
rename from UnitTests/CTextBox/Makefile
rename to graphics/NxWidgets/UnitTests/CTextBox/Makefile
diff --git a/UnitTests/CTextBox/ctextbox.png b/graphics/NxWidgets/UnitTests/CTextBox/ctextbox.png
similarity index 100%
rename from UnitTests/CTextBox/ctextbox.png
rename to graphics/NxWidgets/UnitTests/CTextBox/ctextbox.png
diff --git a/UnitTests/CTextBox/ctextbox_main.cxx b/graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
similarity index 100%
rename from UnitTests/CTextBox/ctextbox_main.cxx
rename to graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
diff --git a/UnitTests/CTextBox/ctextboxtest.cxx b/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx
similarity index 100%
rename from UnitTests/CTextBox/ctextboxtest.cxx
rename to graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx
diff --git a/UnitTests/CTextBox/ctextboxtest.hxx b/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx
similarity index 100%
rename from UnitTests/CTextBox/ctextboxtest.hxx
rename to graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx
diff --git a/UnitTests/README.txt b/graphics/NxWidgets/UnitTests/README.txt
similarity index 100%
rename from UnitTests/README.txt
rename to graphics/NxWidgets/UnitTests/README.txt
diff --git a/UnitTests/TestStatus.txt b/graphics/NxWidgets/UnitTests/TestStatus.txt
similarity index 100%
rename from UnitTests/TestStatus.txt
rename to graphics/NxWidgets/UnitTests/TestStatus.txt
diff --git a/UnitTests/nxwm/.gitignore b/graphics/NxWidgets/UnitTests/nxwm/.gitignore
similarity index 100%
rename from UnitTests/nxwm/.gitignore
rename to graphics/NxWidgets/UnitTests/nxwm/.gitignore
diff --git a/UnitTests/nxwm/Make.defs b/graphics/NxWidgets/UnitTests/nxwm/Make.defs
similarity index 100%
rename from UnitTests/nxwm/Make.defs
rename to graphics/NxWidgets/UnitTests/nxwm/Make.defs
diff --git a/UnitTests/nxwm/Makefile b/graphics/NxWidgets/UnitTests/nxwm/Makefile
similarity index 100%
rename from UnitTests/nxwm/Makefile
rename to graphics/NxWidgets/UnitTests/nxwm/Makefile
diff --git a/UnitTests/nxwm/nxwm_main.cxx b/graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
similarity index 100%
rename from UnitTests/nxwm/nxwm_main.cxx
rename to graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
diff --git a/libnxwidgets/COPYING b/graphics/NxWidgets/libnxwidgets/COPYING
similarity index 100%
rename from libnxwidgets/COPYING
rename to graphics/NxWidgets/libnxwidgets/COPYING
diff --git a/libnxwidgets/Makefile b/graphics/NxWidgets/libnxwidgets/Makefile
similarity index 100%
rename from libnxwidgets/Makefile
rename to graphics/NxWidgets/libnxwidgets/Makefile
diff --git a/libnxwidgets/doc/mainpage.h b/graphics/NxWidgets/libnxwidgets/doc/mainpage.h
similarity index 100%
rename from libnxwidgets/doc/mainpage.h
rename to graphics/NxWidgets/libnxwidgets/doc/mainpage.h
diff --git a/libnxwidgets/include/cbgwindow.hxx b/graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx
similarity index 100%
rename from libnxwidgets/include/cbgwindow.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx
diff --git a/libnxwidgets/include/cbitmap.hxx b/graphics/NxWidgets/libnxwidgets/include/cbitmap.hxx
similarity index 100%
rename from libnxwidgets/include/cbitmap.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cbitmap.hxx
diff --git a/libnxwidgets/include/cbutton.hxx b/graphics/NxWidgets/libnxwidgets/include/cbutton.hxx
similarity index 100%
rename from libnxwidgets/include/cbutton.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cbutton.hxx
diff --git a/libnxwidgets/include/cbuttonarray.hxx b/graphics/NxWidgets/libnxwidgets/include/cbuttonarray.hxx
similarity index 100%
rename from libnxwidgets/include/cbuttonarray.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cbuttonarray.hxx
diff --git a/libnxwidgets/include/ccallback.hxx b/graphics/NxWidgets/libnxwidgets/include/ccallback.hxx
similarity index 100%
rename from libnxwidgets/include/ccallback.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ccallback.hxx
diff --git a/libnxwidgets/include/ccheckbox.hxx b/graphics/NxWidgets/libnxwidgets/include/ccheckbox.hxx
similarity index 100%
rename from libnxwidgets/include/ccheckbox.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ccheckbox.hxx
diff --git a/libnxwidgets/include/ccyclebutton.hxx b/graphics/NxWidgets/libnxwidgets/include/ccyclebutton.hxx
similarity index 100%
rename from libnxwidgets/include/ccyclebutton.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ccyclebutton.hxx
diff --git a/libnxwidgets/include/cglyphbutton.hxx b/graphics/NxWidgets/libnxwidgets/include/cglyphbutton.hxx
similarity index 100%
rename from libnxwidgets/include/cglyphbutton.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cglyphbutton.hxx
diff --git a/libnxwidgets/include/cglyphsliderhorizontal.hxx b/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx
similarity index 100%
rename from libnxwidgets/include/cglyphsliderhorizontal.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx
diff --git a/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx b/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx
similarity index 100%
rename from libnxwidgets/include/cglyphsliderhorizontalgrip.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx
diff --git a/libnxwidgets/include/cgraphicsport.hxx b/graphics/NxWidgets/libnxwidgets/include/cgraphicsport.hxx
similarity index 100%
rename from libnxwidgets/include/cgraphicsport.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cgraphicsport.hxx
diff --git a/libnxwidgets/include/cimage.hxx b/graphics/NxWidgets/libnxwidgets/include/cimage.hxx
similarity index 100%
rename from libnxwidgets/include/cimage.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cimage.hxx
diff --git a/libnxwidgets/include/ckeypad.hxx b/graphics/NxWidgets/libnxwidgets/include/ckeypad.hxx
similarity index 100%
rename from libnxwidgets/include/ckeypad.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ckeypad.hxx
diff --git a/libnxwidgets/include/clabel.hxx b/graphics/NxWidgets/libnxwidgets/include/clabel.hxx
similarity index 100%
rename from libnxwidgets/include/clabel.hxx
rename to graphics/NxWidgets/libnxwidgets/include/clabel.hxx
diff --git a/libnxwidgets/include/clatchbutton.hxx b/graphics/NxWidgets/libnxwidgets/include/clatchbutton.hxx
similarity index 100%
rename from libnxwidgets/include/clatchbutton.hxx
rename to graphics/NxWidgets/libnxwidgets/include/clatchbutton.hxx
diff --git a/libnxwidgets/include/clatchbuttonarray.hxx b/graphics/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx
similarity index 100%
rename from libnxwidgets/include/clatchbuttonarray.hxx
rename to graphics/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx
diff --git a/libnxwidgets/include/clistbox.hxx b/graphics/NxWidgets/libnxwidgets/include/clistbox.hxx
similarity index 100%
rename from libnxwidgets/include/clistbox.hxx
rename to graphics/NxWidgets/libnxwidgets/include/clistbox.hxx
diff --git a/libnxwidgets/include/clistboxdataitem.hxx b/graphics/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx
similarity index 100%
rename from libnxwidgets/include/clistboxdataitem.hxx
rename to graphics/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx
diff --git a/libnxwidgets/include/clistdata.hxx b/graphics/NxWidgets/libnxwidgets/include/clistdata.hxx
similarity index 100%
rename from libnxwidgets/include/clistdata.hxx
rename to graphics/NxWidgets/libnxwidgets/include/clistdata.hxx
diff --git a/libnxwidgets/include/clistdataeventargs.hxx b/graphics/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx
similarity index 100%
rename from libnxwidgets/include/clistdataeventargs.hxx
rename to graphics/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx
diff --git a/libnxwidgets/include/clistdataitem.hxx b/graphics/NxWidgets/libnxwidgets/include/clistdataitem.hxx
similarity index 100%
rename from libnxwidgets/include/clistdataitem.hxx
rename to graphics/NxWidgets/libnxwidgets/include/clistdataitem.hxx
diff --git a/libnxwidgets/include/cmultilinetextbox.hxx b/graphics/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx
similarity index 100%
rename from libnxwidgets/include/cmultilinetextbox.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx
diff --git a/libnxwidgets/include/cnumericedit.hxx b/graphics/NxWidgets/libnxwidgets/include/cnumericedit.hxx
similarity index 100%
rename from libnxwidgets/include/cnumericedit.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnumericedit.hxx
diff --git a/libnxwidgets/include/cnxfont.hxx b/graphics/NxWidgets/libnxwidgets/include/cnxfont.hxx
similarity index 100%
rename from libnxwidgets/include/cnxfont.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnxfont.hxx
diff --git a/libnxwidgets/include/cnxserver.hxx b/graphics/NxWidgets/libnxwidgets/include/cnxserver.hxx
similarity index 100%
rename from libnxwidgets/include/cnxserver.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnxserver.hxx
diff --git a/libnxwidgets/include/cnxstring.hxx b/graphics/NxWidgets/libnxwidgets/include/cnxstring.hxx
similarity index 100%
rename from libnxwidgets/include/cnxstring.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnxstring.hxx
diff --git a/libnxwidgets/include/cnxtimer.hxx b/graphics/NxWidgets/libnxwidgets/include/cnxtimer.hxx
similarity index 100%
rename from libnxwidgets/include/cnxtimer.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnxtimer.hxx
diff --git a/libnxwidgets/include/cnxtkwindow.hxx b/graphics/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
similarity index 100%
rename from libnxwidgets/include/cnxtkwindow.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
diff --git a/libnxwidgets/include/cnxtoolbar.hxx b/graphics/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
similarity index 100%
rename from libnxwidgets/include/cnxtoolbar.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
diff --git a/libnxwidgets/include/cnxwidget.hxx b/graphics/NxWidgets/libnxwidgets/include/cnxwidget.hxx
similarity index 100%
rename from libnxwidgets/include/cnxwidget.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnxwidget.hxx
diff --git a/libnxwidgets/include/cnxwindow.hxx b/graphics/NxWidgets/libnxwidgets/include/cnxwindow.hxx
similarity index 100%
rename from libnxwidgets/include/cnxwindow.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cnxwindow.hxx
diff --git a/libnxwidgets/include/cprogressbar.hxx b/graphics/NxWidgets/libnxwidgets/include/cprogressbar.hxx
similarity index 100%
rename from libnxwidgets/include/cprogressbar.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cprogressbar.hxx
diff --git a/libnxwidgets/include/cradiobutton.hxx b/graphics/NxWidgets/libnxwidgets/include/cradiobutton.hxx
similarity index 100%
rename from libnxwidgets/include/cradiobutton.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cradiobutton.hxx
diff --git a/libnxwidgets/include/cradiobuttongroup.hxx b/graphics/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx
similarity index 100%
rename from libnxwidgets/include/cradiobuttongroup.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx
diff --git a/libnxwidgets/include/crect.hxx b/graphics/NxWidgets/libnxwidgets/include/crect.hxx
similarity index 100%
rename from libnxwidgets/include/crect.hxx
rename to graphics/NxWidgets/libnxwidgets/include/crect.hxx
diff --git a/libnxwidgets/include/crlepalettebitmap.hxx b/graphics/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx
similarity index 100%
rename from libnxwidgets/include/crlepalettebitmap.hxx
rename to graphics/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx
diff --git a/libnxwidgets/include/cscaledbitmap.hxx b/graphics/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
similarity index 100%
rename from libnxwidgets/include/cscaledbitmap.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
diff --git a/libnxwidgets/include/cscrollbarhorizontal.hxx b/graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
similarity index 100%
rename from libnxwidgets/include/cscrollbarhorizontal.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
diff --git a/libnxwidgets/include/cscrollbarpanel.hxx b/graphics/NxWidgets/libnxwidgets/include/cscrollbarpanel.hxx
similarity index 100%
rename from libnxwidgets/include/cscrollbarpanel.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cscrollbarpanel.hxx
diff --git a/libnxwidgets/include/cscrollbarvertical.hxx b/graphics/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx
similarity index 100%
rename from libnxwidgets/include/cscrollbarvertical.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx
diff --git a/libnxwidgets/include/cscrollinglistbox.hxx b/graphics/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx
similarity index 100%
rename from libnxwidgets/include/cscrollinglistbox.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx
diff --git a/libnxwidgets/include/cscrollingpanel.hxx b/graphics/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx
similarity index 100%
rename from libnxwidgets/include/cscrollingpanel.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx
diff --git a/libnxwidgets/include/cscrollingtextbox.hxx b/graphics/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx
similarity index 100%
rename from libnxwidgets/include/cscrollingtextbox.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx
diff --git a/libnxwidgets/include/csliderhorizontal.hxx b/graphics/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx
similarity index 100%
rename from libnxwidgets/include/csliderhorizontal.hxx
rename to graphics/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx
diff --git a/libnxwidgets/include/csliderhorizontalgrip.hxx b/graphics/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx
similarity index 100%
rename from libnxwidgets/include/csliderhorizontalgrip.hxx
rename to graphics/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx
diff --git a/libnxwidgets/include/cslidervertical.hxx b/graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx
similarity index 100%
rename from libnxwidgets/include/cslidervertical.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx
diff --git a/libnxwidgets/include/csliderverticalgrip.hxx b/graphics/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx
similarity index 100%
rename from libnxwidgets/include/csliderverticalgrip.hxx
rename to graphics/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx
diff --git a/libnxwidgets/include/cstickybutton.hxx b/graphics/NxWidgets/libnxwidgets/include/cstickybutton.hxx
similarity index 100%
rename from libnxwidgets/include/cstickybutton.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cstickybutton.hxx
diff --git a/libnxwidgets/include/cstickybuttonarray.hxx b/graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx
similarity index 100%
rename from libnxwidgets/include/cstickybuttonarray.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx
diff --git a/libnxwidgets/include/cstickyimage.hxx b/graphics/NxWidgets/libnxwidgets/include/cstickyimage.hxx
similarity index 100%
rename from libnxwidgets/include/cstickyimage.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cstickyimage.hxx
diff --git a/libnxwidgets/include/cstringiterator.hxx b/graphics/NxWidgets/libnxwidgets/include/cstringiterator.hxx
similarity index 100%
rename from libnxwidgets/include/cstringiterator.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cstringiterator.hxx
diff --git a/libnxwidgets/include/ctabpanel.hxx b/graphics/NxWidgets/libnxwidgets/include/ctabpanel.hxx
similarity index 100%
rename from libnxwidgets/include/ctabpanel.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ctabpanel.hxx
diff --git a/libnxwidgets/include/ctext.hxx b/graphics/NxWidgets/libnxwidgets/include/ctext.hxx
similarity index 100%
rename from libnxwidgets/include/ctext.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ctext.hxx
diff --git a/libnxwidgets/include/ctextbox.hxx b/graphics/NxWidgets/libnxwidgets/include/ctextbox.hxx
similarity index 100%
rename from libnxwidgets/include/ctextbox.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ctextbox.hxx
diff --git a/libnxwidgets/include/cwidgetcontrol.hxx b/graphics/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx
similarity index 100%
rename from libnxwidgets/include/cwidgetcontrol.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx
diff --git a/libnxwidgets/include/cwidgeteventargs.hxx b/graphics/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx
similarity index 100%
rename from libnxwidgets/include/cwidgeteventargs.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx
diff --git a/libnxwidgets/include/cwidgeteventhandler.hxx b/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx
similarity index 100%
rename from libnxwidgets/include/cwidgeteventhandler.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx
diff --git a/libnxwidgets/include/cwidgeteventhandlerlist.hxx b/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx
similarity index 100%
rename from libnxwidgets/include/cwidgeteventhandlerlist.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx
diff --git a/libnxwidgets/include/cwidgetstyle.hxx b/graphics/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx
similarity index 100%
rename from libnxwidgets/include/cwidgetstyle.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx
diff --git a/libnxwidgets/include/cwindoweventhandler.hxx b/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx
similarity index 100%
rename from libnxwidgets/include/cwindoweventhandler.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx
diff --git a/libnxwidgets/include/cwindoweventhandlerlist.hxx b/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx
similarity index 100%
rename from libnxwidgets/include/cwindoweventhandlerlist.hxx
rename to graphics/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx
diff --git a/libnxwidgets/include/glyphs.hxx b/graphics/NxWidgets/libnxwidgets/include/glyphs.hxx
similarity index 100%
rename from libnxwidgets/include/glyphs.hxx
rename to graphics/NxWidgets/libnxwidgets/include/glyphs.hxx
diff --git a/libnxwidgets/include/ibitmap.hxx b/graphics/NxWidgets/libnxwidgets/include/ibitmap.hxx
similarity index 100%
rename from libnxwidgets/include/ibitmap.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ibitmap.hxx
diff --git a/libnxwidgets/include/ilistbox.hxx b/graphics/NxWidgets/libnxwidgets/include/ilistbox.hxx
similarity index 100%
rename from libnxwidgets/include/ilistbox.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ilistbox.hxx
diff --git a/libnxwidgets/include/ilistdataeventhandler.hxx b/graphics/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx
similarity index 100%
rename from libnxwidgets/include/ilistdataeventhandler.hxx
rename to graphics/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx
diff --git a/libnxwidgets/include/inxwindow.hxx b/graphics/NxWidgets/libnxwidgets/include/inxwindow.hxx
similarity index 100%
rename from libnxwidgets/include/inxwindow.hxx
rename to graphics/NxWidgets/libnxwidgets/include/inxwindow.hxx
diff --git a/libnxwidgets/include/iscrollable.hxx b/graphics/NxWidgets/libnxwidgets/include/iscrollable.hxx
similarity index 100%
rename from libnxwidgets/include/iscrollable.hxx
rename to graphics/NxWidgets/libnxwidgets/include/iscrollable.hxx
diff --git a/libnxwidgets/include/islider.hxx b/graphics/NxWidgets/libnxwidgets/include/islider.hxx
similarity index 100%
rename from libnxwidgets/include/islider.hxx
rename to graphics/NxWidgets/libnxwidgets/include/islider.hxx
diff --git a/libnxwidgets/include/itextbox.hxx b/graphics/NxWidgets/libnxwidgets/include/itextbox.hxx
similarity index 100%
rename from libnxwidgets/include/itextbox.hxx
rename to graphics/NxWidgets/libnxwidgets/include/itextbox.hxx
diff --git a/libnxwidgets/include/nxconfig.hxx b/graphics/NxWidgets/libnxwidgets/include/nxconfig.hxx
similarity index 100%
rename from libnxwidgets/include/nxconfig.hxx
rename to graphics/NxWidgets/libnxwidgets/include/nxconfig.hxx
diff --git a/libnxwidgets/include/singletons.hxx b/graphics/NxWidgets/libnxwidgets/include/singletons.hxx
similarity index 100%
rename from libnxwidgets/include/singletons.hxx
rename to graphics/NxWidgets/libnxwidgets/include/singletons.hxx
diff --git a/libnxwidgets/include/teventargs.hxx b/graphics/NxWidgets/libnxwidgets/include/teventargs.hxx
similarity index 100%
rename from libnxwidgets/include/teventargs.hxx
rename to graphics/NxWidgets/libnxwidgets/include/teventargs.hxx
diff --git a/libnxwidgets/include/tnxarray.hxx b/graphics/NxWidgets/libnxwidgets/include/tnxarray.hxx
similarity index 100%
rename from libnxwidgets/include/tnxarray.hxx
rename to graphics/NxWidgets/libnxwidgets/include/tnxarray.hxx
diff --git a/libnxwidgets/src/cbgwindow.cxx b/graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx
similarity index 100%
rename from libnxwidgets/src/cbgwindow.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx
diff --git a/libnxwidgets/src/cbitmap.cxx b/graphics/NxWidgets/libnxwidgets/src/cbitmap.cxx
similarity index 100%
rename from libnxwidgets/src/cbitmap.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cbitmap.cxx
diff --git a/libnxwidgets/src/cbutton.cxx b/graphics/NxWidgets/libnxwidgets/src/cbutton.cxx
similarity index 100%
rename from libnxwidgets/src/cbutton.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cbutton.cxx
diff --git a/libnxwidgets/src/cbuttonarray.cxx b/graphics/NxWidgets/libnxwidgets/src/cbuttonarray.cxx
similarity index 100%
rename from libnxwidgets/src/cbuttonarray.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cbuttonarray.cxx
diff --git a/libnxwidgets/src/ccallback.cxx b/graphics/NxWidgets/libnxwidgets/src/ccallback.cxx
similarity index 100%
rename from libnxwidgets/src/ccallback.cxx
rename to graphics/NxWidgets/libnxwidgets/src/ccallback.cxx
diff --git a/libnxwidgets/src/ccheckbox.cxx b/graphics/NxWidgets/libnxwidgets/src/ccheckbox.cxx
similarity index 100%
rename from libnxwidgets/src/ccheckbox.cxx
rename to graphics/NxWidgets/libnxwidgets/src/ccheckbox.cxx
diff --git a/libnxwidgets/src/ccyclebutton.cxx b/graphics/NxWidgets/libnxwidgets/src/ccyclebutton.cxx
similarity index 100%
rename from libnxwidgets/src/ccyclebutton.cxx
rename to graphics/NxWidgets/libnxwidgets/src/ccyclebutton.cxx
diff --git a/libnxwidgets/src/cglyphbutton.cxx b/graphics/NxWidgets/libnxwidgets/src/cglyphbutton.cxx
similarity index 100%
rename from libnxwidgets/src/cglyphbutton.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cglyphbutton.cxx
diff --git a/libnxwidgets/src/cglyphsliderhorizontal.cxx b/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx
similarity index 100%
rename from libnxwidgets/src/cglyphsliderhorizontal.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx
diff --git a/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx b/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx
similarity index 100%
rename from libnxwidgets/src/cglyphsliderhorizontalgrip.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx
diff --git a/libnxwidgets/src/cgraphicsport.cxx b/graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx
similarity index 100%
rename from libnxwidgets/src/cgraphicsport.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx
diff --git a/libnxwidgets/src/cimage.cxx b/graphics/NxWidgets/libnxwidgets/src/cimage.cxx
similarity index 100%
rename from libnxwidgets/src/cimage.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cimage.cxx
diff --git a/libnxwidgets/src/ckeypad.cxx b/graphics/NxWidgets/libnxwidgets/src/ckeypad.cxx
similarity index 100%
rename from libnxwidgets/src/ckeypad.cxx
rename to graphics/NxWidgets/libnxwidgets/src/ckeypad.cxx
diff --git a/libnxwidgets/src/clabel.cxx b/graphics/NxWidgets/libnxwidgets/src/clabel.cxx
similarity index 100%
rename from libnxwidgets/src/clabel.cxx
rename to graphics/NxWidgets/libnxwidgets/src/clabel.cxx
diff --git a/libnxwidgets/src/clatchbutton.cxx b/graphics/NxWidgets/libnxwidgets/src/clatchbutton.cxx
similarity index 100%
rename from libnxwidgets/src/clatchbutton.cxx
rename to graphics/NxWidgets/libnxwidgets/src/clatchbutton.cxx
diff --git a/libnxwidgets/src/clatchbuttonarray.cxx b/graphics/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx
similarity index 100%
rename from libnxwidgets/src/clatchbuttonarray.cxx
rename to graphics/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx
diff --git a/libnxwidgets/src/clistbox.cxx b/graphics/NxWidgets/libnxwidgets/src/clistbox.cxx
similarity index 100%
rename from libnxwidgets/src/clistbox.cxx
rename to graphics/NxWidgets/libnxwidgets/src/clistbox.cxx
diff --git a/libnxwidgets/src/clistboxdataitem.cxx b/graphics/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx
similarity index 100%
rename from libnxwidgets/src/clistboxdataitem.cxx
rename to graphics/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx
diff --git a/libnxwidgets/src/clistdata.cxx b/graphics/NxWidgets/libnxwidgets/src/clistdata.cxx
similarity index 100%
rename from libnxwidgets/src/clistdata.cxx
rename to graphics/NxWidgets/libnxwidgets/src/clistdata.cxx
diff --git a/libnxwidgets/src/clistdataitem.cxx b/graphics/NxWidgets/libnxwidgets/src/clistdataitem.cxx
similarity index 100%
rename from libnxwidgets/src/clistdataitem.cxx
rename to graphics/NxWidgets/libnxwidgets/src/clistdataitem.cxx
diff --git a/libnxwidgets/src/cmultilinetextbox.cxx b/graphics/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx
similarity index 100%
rename from libnxwidgets/src/cmultilinetextbox.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx
diff --git a/libnxwidgets/src/cnumericedit.cxx b/graphics/NxWidgets/libnxwidgets/src/cnumericedit.cxx
similarity index 100%
rename from libnxwidgets/src/cnumericedit.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnumericedit.cxx
diff --git a/libnxwidgets/src/cnxfont.cxx b/graphics/NxWidgets/libnxwidgets/src/cnxfont.cxx
similarity index 100%
rename from libnxwidgets/src/cnxfont.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnxfont.cxx
diff --git a/libnxwidgets/src/cnxserver.cxx b/graphics/NxWidgets/libnxwidgets/src/cnxserver.cxx
similarity index 100%
rename from libnxwidgets/src/cnxserver.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnxserver.cxx
diff --git a/libnxwidgets/src/cnxstring.cxx b/graphics/NxWidgets/libnxwidgets/src/cnxstring.cxx
similarity index 100%
rename from libnxwidgets/src/cnxstring.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnxstring.cxx
diff --git a/libnxwidgets/src/cnxtimer.cxx b/graphics/NxWidgets/libnxwidgets/src/cnxtimer.cxx
similarity index 100%
rename from libnxwidgets/src/cnxtimer.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnxtimer.cxx
diff --git a/libnxwidgets/src/cnxtkwindow.cxx b/graphics/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx
similarity index 100%
rename from libnxwidgets/src/cnxtkwindow.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx
diff --git a/libnxwidgets/src/cnxtoolbar.cxx b/graphics/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx
similarity index 100%
rename from libnxwidgets/src/cnxtoolbar.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx
diff --git a/libnxwidgets/src/cnxwidget.cxx b/graphics/NxWidgets/libnxwidgets/src/cnxwidget.cxx
similarity index 100%
rename from libnxwidgets/src/cnxwidget.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnxwidget.cxx
diff --git a/libnxwidgets/src/cnxwindow.cxx b/graphics/NxWidgets/libnxwidgets/src/cnxwindow.cxx
similarity index 100%
rename from libnxwidgets/src/cnxwindow.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cnxwindow.cxx
diff --git a/libnxwidgets/src/cprogressbar.cxx b/graphics/NxWidgets/libnxwidgets/src/cprogressbar.cxx
similarity index 100%
rename from libnxwidgets/src/cprogressbar.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cprogressbar.cxx
diff --git a/libnxwidgets/src/cradiobutton.cxx b/graphics/NxWidgets/libnxwidgets/src/cradiobutton.cxx
similarity index 100%
rename from libnxwidgets/src/cradiobutton.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cradiobutton.cxx
diff --git a/libnxwidgets/src/cradiobuttongroup.cxx b/graphics/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx
similarity index 100%
rename from libnxwidgets/src/cradiobuttongroup.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx
diff --git a/libnxwidgets/src/crect.cxx b/graphics/NxWidgets/libnxwidgets/src/crect.cxx
similarity index 100%
rename from libnxwidgets/src/crect.cxx
rename to graphics/NxWidgets/libnxwidgets/src/crect.cxx
diff --git a/libnxwidgets/src/crlepalettebitmap.cxx b/graphics/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx
similarity index 100%
rename from libnxwidgets/src/crlepalettebitmap.cxx
rename to graphics/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx
diff --git a/libnxwidgets/src/cscaledbitmap.cxx b/graphics/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx
similarity index 100%
rename from libnxwidgets/src/cscaledbitmap.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx
diff --git a/libnxwidgets/src/cscrollbarhorizontal.cxx b/graphics/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx
similarity index 100%
rename from libnxwidgets/src/cscrollbarhorizontal.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx
diff --git a/libnxwidgets/src/cscrollbarpanel.cxx b/graphics/NxWidgets/libnxwidgets/src/cscrollbarpanel.cxx
similarity index 100%
rename from libnxwidgets/src/cscrollbarpanel.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cscrollbarpanel.cxx
diff --git a/libnxwidgets/src/cscrollbarvertical.cxx b/graphics/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx
similarity index 100%
rename from libnxwidgets/src/cscrollbarvertical.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx
diff --git a/libnxwidgets/src/cscrollinglistbox.cxx b/graphics/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx
similarity index 100%
rename from libnxwidgets/src/cscrollinglistbox.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx
diff --git a/libnxwidgets/src/cscrollingpanel.cxx b/graphics/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx
similarity index 100%
rename from libnxwidgets/src/cscrollingpanel.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx
diff --git a/libnxwidgets/src/cscrollingtextbox.cxx b/graphics/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx
similarity index 100%
rename from libnxwidgets/src/cscrollingtextbox.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx
diff --git a/libnxwidgets/src/csliderhorizontal.cxx b/graphics/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx
similarity index 100%
rename from libnxwidgets/src/csliderhorizontal.cxx
rename to graphics/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx
diff --git a/libnxwidgets/src/csliderhorizontalgrip.cxx b/graphics/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx
similarity index 100%
rename from libnxwidgets/src/csliderhorizontalgrip.cxx
rename to graphics/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx
diff --git a/libnxwidgets/src/cslidervertical.cxx b/graphics/NxWidgets/libnxwidgets/src/cslidervertical.cxx
similarity index 100%
rename from libnxwidgets/src/cslidervertical.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cslidervertical.cxx
diff --git a/libnxwidgets/src/csliderverticalgrip.cxx b/graphics/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx
similarity index 100%
rename from libnxwidgets/src/csliderverticalgrip.cxx
rename to graphics/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx
diff --git a/libnxwidgets/src/cstickybutton.cxx b/graphics/NxWidgets/libnxwidgets/src/cstickybutton.cxx
similarity index 100%
rename from libnxwidgets/src/cstickybutton.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cstickybutton.cxx
diff --git a/libnxwidgets/src/cstickybuttonarray.cxx b/graphics/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx
similarity index 100%
rename from libnxwidgets/src/cstickybuttonarray.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx
diff --git a/libnxwidgets/src/cstickyimage.cxx b/graphics/NxWidgets/libnxwidgets/src/cstickyimage.cxx
similarity index 100%
rename from libnxwidgets/src/cstickyimage.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cstickyimage.cxx
diff --git a/libnxwidgets/src/cstringiterator.cxx b/graphics/NxWidgets/libnxwidgets/src/cstringiterator.cxx
similarity index 100%
rename from libnxwidgets/src/cstringiterator.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cstringiterator.cxx
diff --git a/libnxwidgets/src/ctabpanel.cxx b/graphics/NxWidgets/libnxwidgets/src/ctabpanel.cxx
similarity index 100%
rename from libnxwidgets/src/ctabpanel.cxx
rename to graphics/NxWidgets/libnxwidgets/src/ctabpanel.cxx
diff --git a/libnxwidgets/src/ctext.cxx b/graphics/NxWidgets/libnxwidgets/src/ctext.cxx
similarity index 100%
rename from libnxwidgets/src/ctext.cxx
rename to graphics/NxWidgets/libnxwidgets/src/ctext.cxx
diff --git a/libnxwidgets/src/ctextbox.cxx b/graphics/NxWidgets/libnxwidgets/src/ctextbox.cxx
similarity index 100%
rename from libnxwidgets/src/ctextbox.cxx
rename to graphics/NxWidgets/libnxwidgets/src/ctextbox.cxx
diff --git a/libnxwidgets/src/cwidgetcontrol.cxx b/graphics/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx
similarity index 100%
rename from libnxwidgets/src/cwidgetcontrol.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx
diff --git a/libnxwidgets/src/cwidgeteventhandlerlist.cxx b/graphics/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx
similarity index 100%
rename from libnxwidgets/src/cwidgeteventhandlerlist.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx
diff --git a/libnxwidgets/src/cwindoweventhandlerlist.cxx b/graphics/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx
similarity index 100%
rename from libnxwidgets/src/cwindoweventhandlerlist.cxx
rename to graphics/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx
diff --git a/libnxwidgets/src/glyph_arrowdown.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_arrowdown.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx
diff --git a/libnxwidgets/src/glyph_arrowleft.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_arrowleft.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx
diff --git a/libnxwidgets/src/glyph_arrowright.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_arrowright.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx
diff --git a/libnxwidgets/src/glyph_arrowup.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_arrowup.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx
diff --git a/libnxwidgets/src/glyph_backspace.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_backspace.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_backspace.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_backspace.cxx
diff --git a/libnxwidgets/src/glyph_capslock.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_capslock.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_capslock.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_capslock.cxx
diff --git a/libnxwidgets/src/glyph_checkboxmu.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_checkboxmu.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx
diff --git a/libnxwidgets/src/glyph_checkboxoff.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_checkboxoff.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx
diff --git a/libnxwidgets/src/glyph_checkboxon.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_checkboxon.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx
diff --git a/libnxwidgets/src/glyph_control.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_control.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_control.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_control.cxx
diff --git a/libnxwidgets/src/glyph_cycle.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_cycle.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_cycle.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_cycle.cxx
diff --git a/libnxwidgets/src/glyph_nxlogo160x160.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_nxlogo160x160.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx
diff --git a/libnxwidgets/src/glyph_nxlogo320x320.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_nxlogo320x320.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx
diff --git a/libnxwidgets/src/glyph_radiobuttonmu.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_radiobuttonmu.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx
diff --git a/libnxwidgets/src/glyph_radiobuttonoff.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_radiobuttonoff.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx
diff --git a/libnxwidgets/src/glyph_radiobuttonon.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_radiobuttonon.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx
diff --git a/libnxwidgets/src/glyph_return.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_return.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_return.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_return.cxx
diff --git a/libnxwidgets/src/glyph_screendepthdown.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_screendepthdown.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx
diff --git a/libnxwidgets/src/glyph_screendepthup.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_screendepthup.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx
diff --git a/libnxwidgets/src/glyph_screenflipdown.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_screenflipdown.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx
diff --git a/libnxwidgets/src/glyph_screenflipup.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_screenflipup.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx
diff --git a/libnxwidgets/src/glyph_shift.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_shift.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_shift.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_shift.cxx
diff --git a/libnxwidgets/src/glyph_windowclose.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_windowclose.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx
diff --git a/libnxwidgets/src/glyph_windowdepthdown.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_windowdepthdown.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx
diff --git a/libnxwidgets/src/glyph_windowdepthup.cxx b/graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx
similarity index 100%
rename from libnxwidgets/src/glyph_windowdepthup.cxx
rename to graphics/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx
diff --git a/libnxwidgets/src/singletons.cxx b/graphics/NxWidgets/libnxwidgets/src/singletons.cxx
similarity index 100%
rename from libnxwidgets/src/singletons.cxx
rename to graphics/NxWidgets/libnxwidgets/src/singletons.cxx
diff --git a/nxwm/.gitignore b/graphics/NxWidgets/nxwm/.gitignore
similarity index 100%
rename from nxwm/.gitignore
rename to graphics/NxWidgets/nxwm/.gitignore
diff --git a/nxwm/COPYING b/graphics/NxWidgets/nxwm/COPYING
similarity index 100%
rename from nxwm/COPYING
rename to graphics/NxWidgets/nxwm/COPYING
diff --git a/nxwm/Makefile b/graphics/NxWidgets/nxwm/Makefile
similarity index 100%
rename from nxwm/Makefile
rename to graphics/NxWidgets/nxwm/Makefile
diff --git a/nxwm/doc/NxWM-ThreadingModel.ppt b/graphics/NxWidgets/nxwm/doc/NxWM-ThreadingModel.ppt
similarity index 100%
rename from nxwm/doc/NxWM-ThreadingModel.ppt
rename to graphics/NxWidgets/nxwm/doc/NxWM-ThreadingModel.ppt
diff --git a/nxwm/images/calculator24x25.png b/graphics/NxWidgets/nxwm/images/calculator24x25.png
similarity index 100%
rename from nxwm/images/calculator24x25.png
rename to graphics/NxWidgets/nxwm/images/calculator24x25.png
diff --git a/nxwm/images/calculator47x49.png b/graphics/NxWidgets/nxwm/images/calculator47x49.png
similarity index 100%
rename from nxwm/images/calculator47x49.png
rename to graphics/NxWidgets/nxwm/images/calculator47x49.png
diff --git a/nxwm/images/calibration24x21.png b/graphics/NxWidgets/nxwm/images/calibration24x21.png
similarity index 100%
rename from nxwm/images/calibration24x21.png
rename to graphics/NxWidgets/nxwm/images/calibration24x21.png
diff --git a/nxwm/images/calibration48x42.png b/graphics/NxWidgets/nxwm/images/calibration48x42.png
similarity index 100%
rename from nxwm/images/calibration48x42.png
rename to graphics/NxWidgets/nxwm/images/calibration48x42.png
diff --git a/nxwm/images/cmd25x22.png b/graphics/NxWidgets/nxwm/images/cmd25x22.png
similarity index 100%
rename from nxwm/images/cmd25x22.png
rename to graphics/NxWidgets/nxwm/images/cmd25x22.png
diff --git a/nxwm/images/cmd49x43.png b/graphics/NxWidgets/nxwm/images/cmd49x43.png
similarity index 100%
rename from nxwm/images/cmd49x43.png
rename to graphics/NxWidgets/nxwm/images/cmd49x43.png
diff --git a/nxwm/images/mediaforward32x32.png b/graphics/NxWidgets/nxwm/images/mediaforward32x32.png
similarity index 100%
rename from nxwm/images/mediaforward32x32.png
rename to graphics/NxWidgets/nxwm/images/mediaforward32x32.png
diff --git a/nxwm/images/mediaforward43x41.png b/graphics/NxWidgets/nxwm/images/mediaforward43x41.png
similarity index 100%
rename from nxwm/images/mediaforward43x41.png
rename to graphics/NxWidgets/nxwm/images/mediaforward43x41.png
diff --git a/nxwm/images/mediagrip22x22.png b/graphics/NxWidgets/nxwm/images/mediagrip22x22.png
similarity index 100%
rename from nxwm/images/mediagrip22x22.png
rename to graphics/NxWidgets/nxwm/images/mediagrip22x22.png
diff --git a/nxwm/images/mediagrip60x30.png b/graphics/NxWidgets/nxwm/images/mediagrip60x30.png
similarity index 100%
rename from nxwm/images/mediagrip60x30.png
rename to graphics/NxWidgets/nxwm/images/mediagrip60x30.png
diff --git a/nxwm/images/mediapause32x32.png b/graphics/NxWidgets/nxwm/images/mediapause32x32.png
similarity index 100%
rename from nxwm/images/mediapause32x32.png
rename to graphics/NxWidgets/nxwm/images/mediapause32x32.png
diff --git a/nxwm/images/mediapause43x41.png b/graphics/NxWidgets/nxwm/images/mediapause43x41.png
similarity index 100%
rename from nxwm/images/mediapause43x41.png
rename to graphics/NxWidgets/nxwm/images/mediapause43x41.png
diff --git a/nxwm/images/mediaplay32x32.png b/graphics/NxWidgets/nxwm/images/mediaplay32x32.png
similarity index 100%
rename from nxwm/images/mediaplay32x32.png
rename to graphics/NxWidgets/nxwm/images/mediaplay32x32.png
diff --git a/nxwm/images/mediaplay43x41.png b/graphics/NxWidgets/nxwm/images/mediaplay43x41.png
similarity index 100%
rename from nxwm/images/mediaplay43x41.png
rename to graphics/NxWidgets/nxwm/images/mediaplay43x41.png
diff --git a/nxwm/images/mediaplayer24x24.png b/graphics/NxWidgets/nxwm/images/mediaplayer24x24.png
similarity index 100%
rename from nxwm/images/mediaplayer24x24.png
rename to graphics/NxWidgets/nxwm/images/mediaplayer24x24.png
diff --git a/nxwm/images/mediaplayer44x50.png b/graphics/NxWidgets/nxwm/images/mediaplayer44x50.png
similarity index 100%
rename from nxwm/images/mediaplayer44x50.png
rename to graphics/NxWidgets/nxwm/images/mediaplayer44x50.png
diff --git a/nxwm/images/mediarewind32x32.png b/graphics/NxWidgets/nxwm/images/mediarewind32x32.png
similarity index 100%
rename from nxwm/images/mediarewind32x32.png
rename to graphics/NxWidgets/nxwm/images/mediarewind32x32.png
diff --git a/nxwm/images/mediarewind43x41.png b/graphics/NxWidgets/nxwm/images/mediarewind43x41.png
similarity index 100%
rename from nxwm/images/mediarewind43x41.png
rename to graphics/NxWidgets/nxwm/images/mediarewind43x41.png
diff --git a/nxwm/images/minimize21x21.png b/graphics/NxWidgets/nxwm/images/minimize21x21.png
similarity index 100%
rename from nxwm/images/minimize21x21.png
rename to graphics/NxWidgets/nxwm/images/minimize21x21.png
diff --git a/nxwm/images/minimize42x42.png b/graphics/NxWidgets/nxwm/images/minimize42x42.png
similarity index 100%
rename from nxwm/images/minimize42x42.png
rename to graphics/NxWidgets/nxwm/images/minimize42x42.png
diff --git a/nxwm/images/play24x24.png b/graphics/NxWidgets/nxwm/images/play24x24.png
similarity index 100%
rename from nxwm/images/play24x24.png
rename to graphics/NxWidgets/nxwm/images/play24x24.png
diff --git a/nxwm/images/play48x48.png b/graphics/NxWidgets/nxwm/images/play48x48.png
similarity index 100%
rename from nxwm/images/play48x48.png
rename to graphics/NxWidgets/nxwm/images/play48x48.png
diff --git a/nxwm/images/stop21x21.png b/graphics/NxWidgets/nxwm/images/stop21x21.png
similarity index 100%
rename from nxwm/images/stop21x21.png
rename to graphics/NxWidgets/nxwm/images/stop21x21.png
diff --git a/nxwm/images/stop42x42.png b/graphics/NxWidgets/nxwm/images/stop42x42.png
similarity index 100%
rename from nxwm/images/stop42x42.png
rename to graphics/NxWidgets/nxwm/images/stop42x42.png
diff --git a/nxwm/include/capplicationwindow.hxx b/graphics/NxWidgets/nxwm/include/capplicationwindow.hxx
similarity index 100%
rename from nxwm/include/capplicationwindow.hxx
rename to graphics/NxWidgets/nxwm/include/capplicationwindow.hxx
diff --git a/nxwm/include/ccalibration.hxx b/graphics/NxWidgets/nxwm/include/ccalibration.hxx
similarity index 100%
rename from nxwm/include/ccalibration.hxx
rename to graphics/NxWidgets/nxwm/include/ccalibration.hxx
diff --git a/nxwm/include/cfullscreenwindow.hxx b/graphics/NxWidgets/nxwm/include/cfullscreenwindow.hxx
similarity index 100%
rename from nxwm/include/cfullscreenwindow.hxx
rename to graphics/NxWidgets/nxwm/include/cfullscreenwindow.hxx
diff --git a/nxwm/include/chexcalculator.hxx b/graphics/NxWidgets/nxwm/include/chexcalculator.hxx
similarity index 100%
rename from nxwm/include/chexcalculator.hxx
rename to graphics/NxWidgets/nxwm/include/chexcalculator.hxx
diff --git a/nxwm/include/ckeyboard.hxx b/graphics/NxWidgets/nxwm/include/ckeyboard.hxx
similarity index 100%
rename from nxwm/include/ckeyboard.hxx
rename to graphics/NxWidgets/nxwm/include/ckeyboard.hxx
diff --git a/nxwm/include/cmediaplayer.hxx b/graphics/NxWidgets/nxwm/include/cmediaplayer.hxx
similarity index 100%
rename from nxwm/include/cmediaplayer.hxx
rename to graphics/NxWidgets/nxwm/include/cmediaplayer.hxx
diff --git a/nxwm/include/cnxterm.hxx b/graphics/NxWidgets/nxwm/include/cnxterm.hxx
similarity index 100%
rename from nxwm/include/cnxterm.hxx
rename to graphics/NxWidgets/nxwm/include/cnxterm.hxx
diff --git a/nxwm/include/cstartwindow.hxx b/graphics/NxWidgets/nxwm/include/cstartwindow.hxx
similarity index 100%
rename from nxwm/include/cstartwindow.hxx
rename to graphics/NxWidgets/nxwm/include/cstartwindow.hxx
diff --git a/nxwm/include/ctaskbar.hxx b/graphics/NxWidgets/nxwm/include/ctaskbar.hxx
similarity index 100%
rename from nxwm/include/ctaskbar.hxx
rename to graphics/NxWidgets/nxwm/include/ctaskbar.hxx
diff --git a/nxwm/include/ctouchscreen.hxx b/graphics/NxWidgets/nxwm/include/ctouchscreen.hxx
similarity index 100%
rename from nxwm/include/ctouchscreen.hxx
rename to graphics/NxWidgets/nxwm/include/ctouchscreen.hxx
diff --git a/nxwm/include/cwindowmessenger.hxx b/graphics/NxWidgets/nxwm/include/cwindowmessenger.hxx
similarity index 100%
rename from nxwm/include/cwindowmessenger.hxx
rename to graphics/NxWidgets/nxwm/include/cwindowmessenger.hxx
diff --git a/nxwm/include/iapplication.hxx b/graphics/NxWidgets/nxwm/include/iapplication.hxx
similarity index 100%
rename from nxwm/include/iapplication.hxx
rename to graphics/NxWidgets/nxwm/include/iapplication.hxx
diff --git a/nxwm/include/iapplicationwindow.hxx b/graphics/NxWidgets/nxwm/include/iapplicationwindow.hxx
similarity index 100%
rename from nxwm/include/iapplicationwindow.hxx
rename to graphics/NxWidgets/nxwm/include/iapplicationwindow.hxx
diff --git a/nxwm/include/nxwmconfig.hxx b/graphics/NxWidgets/nxwm/include/nxwmconfig.hxx
similarity index 100%
rename from nxwm/include/nxwmconfig.hxx
rename to graphics/NxWidgets/nxwm/include/nxwmconfig.hxx
diff --git a/nxwm/include/nxwmglyphs.hxx b/graphics/NxWidgets/nxwm/include/nxwmglyphs.hxx
similarity index 100%
rename from nxwm/include/nxwmglyphs.hxx
rename to graphics/NxWidgets/nxwm/include/nxwmglyphs.hxx
diff --git a/nxwm/src/capplicationwindow.cxx b/graphics/NxWidgets/nxwm/src/capplicationwindow.cxx
similarity index 100%
rename from nxwm/src/capplicationwindow.cxx
rename to graphics/NxWidgets/nxwm/src/capplicationwindow.cxx
diff --git a/nxwm/src/ccalibration.cxx b/graphics/NxWidgets/nxwm/src/ccalibration.cxx
similarity index 100%
rename from nxwm/src/ccalibration.cxx
rename to graphics/NxWidgets/nxwm/src/ccalibration.cxx
diff --git a/nxwm/src/cfullscreenwindow.cxx b/graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx
similarity index 100%
rename from nxwm/src/cfullscreenwindow.cxx
rename to graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx
diff --git a/nxwm/src/chexcalculator.cxx b/graphics/NxWidgets/nxwm/src/chexcalculator.cxx
similarity index 100%
rename from nxwm/src/chexcalculator.cxx
rename to graphics/NxWidgets/nxwm/src/chexcalculator.cxx
diff --git a/nxwm/src/ckeyboard.cxx b/graphics/NxWidgets/nxwm/src/ckeyboard.cxx
similarity index 100%
rename from nxwm/src/ckeyboard.cxx
rename to graphics/NxWidgets/nxwm/src/ckeyboard.cxx
diff --git a/nxwm/src/cmediaplayer.cxx b/graphics/NxWidgets/nxwm/src/cmediaplayer.cxx
similarity index 100%
rename from nxwm/src/cmediaplayer.cxx
rename to graphics/NxWidgets/nxwm/src/cmediaplayer.cxx
diff --git a/nxwm/src/cnxterm.cxx b/graphics/NxWidgets/nxwm/src/cnxterm.cxx
similarity index 100%
rename from nxwm/src/cnxterm.cxx
rename to graphics/NxWidgets/nxwm/src/cnxterm.cxx
diff --git a/nxwm/src/cstartwindow.cxx b/graphics/NxWidgets/nxwm/src/cstartwindow.cxx
similarity index 100%
rename from nxwm/src/cstartwindow.cxx
rename to graphics/NxWidgets/nxwm/src/cstartwindow.cxx
diff --git a/nxwm/src/ctaskbar.cxx b/graphics/NxWidgets/nxwm/src/ctaskbar.cxx
similarity index 100%
rename from nxwm/src/ctaskbar.cxx
rename to graphics/NxWidgets/nxwm/src/ctaskbar.cxx
diff --git a/nxwm/src/ctouchscreen.cxx b/graphics/NxWidgets/nxwm/src/ctouchscreen.cxx
similarity index 100%
rename from nxwm/src/ctouchscreen.cxx
rename to graphics/NxWidgets/nxwm/src/ctouchscreen.cxx
diff --git a/nxwm/src/cwindowmessenger.cxx b/graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx
similarity index 100%
rename from nxwm/src/cwindowmessenger.cxx
rename to graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx
diff --git a/nxwm/src/glyph_calculator24x25.cxx b/graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx
similarity index 100%
rename from nxwm/src/glyph_calculator24x25.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx
diff --git a/nxwm/src/glyph_calculator47x49.cxx b/graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx
similarity index 100%
rename from nxwm/src/glyph_calculator47x49.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx
diff --git a/nxwm/src/glyph_calibration24x21.cxx b/graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx
similarity index 100%
rename from nxwm/src/glyph_calibration24x21.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx
diff --git a/nxwm/src/glyph_calibration48x42.cxx b/graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx
similarity index 100%
rename from nxwm/src/glyph_calibration48x42.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx
diff --git a/nxwm/src/glyph_cmd25x22.cxx b/graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx
similarity index 100%
rename from nxwm/src/glyph_cmd25x22.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx
diff --git a/nxwm/src/glyph_cmd49x43.cxx b/graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx
similarity index 100%
rename from nxwm/src/glyph_cmd49x43.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx
diff --git a/nxwm/src/glyph_mediagrip60x30.cxx b/graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx
similarity index 100%
rename from nxwm/src/glyph_mediagrip60x30.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx
diff --git a/nxwm/src/glyph_mediaplayer24x24.cxx b/graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx
similarity index 100%
rename from nxwm/src/glyph_mediaplayer24x24.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx
diff --git a/nxwm/src/glyph_mediaplayer44x50.cxx b/graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx
similarity index 100%
rename from nxwm/src/glyph_mediaplayer44x50.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx
diff --git a/nxwm/src/glyph_minimize21x21.cxx b/graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx
similarity index 100%
rename from nxwm/src/glyph_minimize21x21.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx
diff --git a/nxwm/src/glyph_minimize42x42.cxx b/graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx
similarity index 100%
rename from nxwm/src/glyph_minimize42x42.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx
diff --git a/nxwm/src/glyph_mplayer_controls32x32.cxx b/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx
similarity index 100%
rename from nxwm/src/glyph_mplayer_controls32x32.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx
diff --git a/nxwm/src/glyph_mplayer_controls43x41.cxx b/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx
similarity index 100%
rename from nxwm/src/glyph_mplayer_controls43x41.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx
diff --git a/nxwm/src/glyph_play24x24.cxx b/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx
similarity index 100%
rename from nxwm/src/glyph_play24x24.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx
diff --git a/nxwm/src/glyph_play48x48.cxx b/graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx
similarity index 100%
rename from nxwm/src/glyph_play48x48.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx
diff --git a/nxwm/src/glyph_stop21x21.cxx b/graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx
similarity index 100%
rename from nxwm/src/glyph_stop21x21.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx
diff --git a/nxwm/src/glyph_stop42x42.cxx b/graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx
similarity index 100%
rename from nxwm/src/glyph_stop42x42.cxx
rename to graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx
diff --git a/tools/README.txt b/graphics/NxWidgets/tools/README.txt
similarity index 100%
rename from tools/README.txt
rename to graphics/NxWidgets/tools/README.txt
diff --git a/tools/addobjs.sh b/graphics/NxWidgets/tools/addobjs.sh
similarity index 100%
rename from tools/addobjs.sh
rename to graphics/NxWidgets/tools/addobjs.sh
diff --git a/tools/bitmap_converter.py b/graphics/NxWidgets/tools/bitmap_converter.py
similarity index 100%
rename from tools/bitmap_converter.py
rename to graphics/NxWidgets/tools/bitmap_converter.py
diff --git a/tools/indent.sh b/graphics/NxWidgets/tools/indent.sh
similarity index 100%
rename from tools/indent.sh
rename to graphics/NxWidgets/tools/indent.sh
diff --git a/tools/install.sh b/graphics/NxWidgets/tools/install.sh
similarity index 100%
rename from tools/install.sh
rename to graphics/NxWidgets/tools/install.sh
diff --git a/tools/zipme.sh b/graphics/NxWidgets/tools/zipme.sh
similarity index 100%
rename from tools/zipme.sh
rename to graphics/NxWidgets/tools/zipme.sh