Restructure dbus and glib