This is a plain subtree merge without any changes to the tuhigui tree itself. As we'll keep the distinction between the DBus server and the GTK UI, the directory layout will reflect that.
Peter Hutterer