Tidy up communication classes (websockets/jsonrpc/xbmc)