DBus refactoring, part 2

Signed-off-by: Rob Caelers <robc@krandor.org>
DBus refactoring, part 3

Signed-off-by: Rob Caelers <robc@krandor.org>