Reorganize the dbus control module code