fixed build, big refactoring, coming closer to clean frcp/xmpp plugin