Organize the code in sub directories and separate client from server code
Add dbus_client for wrapping bus, object manager, signal handling and such