chore(dbus): reorganization/clean up