remove jabber and add more submodules