Werror

- Move orphan DBus JSON instances to their own module