43 files changed, 187 insertions, 163 deletions

diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java b/src/main/java/de/pixart/messenger/xmpp/OnAdvancedStreamFeaturesLoaded.java
index e45eba73e..572b61bc1 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnAdvancedStreamFeaturesLoaded.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
-import eu.siacs.conversations.entities.Account;
+import de.pixart.messenger.entities.Account;
 
 public interface OnAdvancedStreamFeaturesLoaded {
 	public void onAdvancedStreamFeaturesAvailable(final Account account);
diff --git a/src/main/java/de/pixart/messenger/xmpp/OnBindListener.java b/src/main/java/de/pixart/messenger/xmpp/OnBindListener.java
new file mode 100644
index 000000000..cafc3fadb
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/xmpp/OnBindListener.java
@@ -0,0 +1,7 @@
+package de.pixart.messenger.xmpp;
+
+import de.pixart.messenger.entities.Account;
+
+public interface OnBindListener {
+	public void onBind(Account account);
+}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java b/src/main/java/de/pixart/messenger/xmpp/OnContactStatusChanged.java
index 20b17f021..be1c51b72 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnContactStatusChanged.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
-import eu.siacs.conversations.entities.Contact;
+import de.pixart.messenger.entities.Contact;
 
 public interface OnContactStatusChanged {
 	public void onContactStatusChanged(final Contact contact, final boolean online);
diff --git a/src/main/java/de/pixart/messenger/xmpp/OnIqPacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/OnIqPacketReceived.java
new file mode 100644
index 000000000..b07b6258e
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/xmpp/OnIqPacketReceived.java
@@ -0,0 +1,8 @@
+package de.pixart.messenger.xmpp;
+
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.xmpp.stanzas.IqPacket;
+
+public interface OnIqPacketReceived extends PacketReceived {
+	public void onIqPacketReceived(Account account, IqPacket packet);
+}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnKeyStatusUpdated.java b/src/main/java/de/pixart/messenger/xmpp/OnKeyStatusUpdated.java
index e7fc582e4..3727d37d7 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnKeyStatusUpdated.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnKeyStatusUpdated.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
-import eu.siacs.conversations.crypto.axolotl.AxolotlService;
+import de.pixart.messenger.crypto.axolotl.AxolotlService;
 
 public interface OnKeyStatusUpdated {
 	public void onKeyStatusUpdated(AxolotlService.FetchStatus report);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java b/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java
index 5f670d933..3ab3bd75a 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
-import eu.siacs.conversations.entities.Account;
+import de.pixart.messenger.entities.Account;
 
 public interface OnMessageAcknowledged {
 	public void onMessageAcknowledged(Account account, String id);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/OnMessagePacketReceived.java
index 325e945f0..9a0f3bb2b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnMessagePacketReceived.java
@@ -1,7 +1,7 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.xmpp.stanzas.MessagePacket;
 
 public interface OnMessagePacketReceived extends PacketReceived {
 	public void onMessagePacketReceived(Account account, MessagePacket packet);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnNewKeysAvailable.java b/src/main/java/de/pixart/messenger/xmpp/OnNewKeysAvailable.java
index e69de29bb..e69de29bb 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnNewKeysAvailable.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnNewKeysAvailable.java
diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/OnPresencePacketReceived.java
index 95c1acfcc..5419443a2 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnPresencePacketReceived.java
@@ -1,7 +1,7 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.xmpp.stanzas.PresencePacket;
 
 public interface OnPresencePacketReceived extends PacketReceived {
 	public void onPresencePacketReceived(Account account, PresencePacket packet);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java b/src/main/java/de/pixart/messenger/xmpp/OnStatusChanged.java
index ad1d98cb9..7f1e07b9c 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnStatusChanged.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
-import eu.siacs.conversations.entities.Account;
+import de.pixart.messenger.entities.Account;
 
 public interface OnStatusChanged {
 	public void onStatusChanged(Account account);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java b/src/main/java/de/pixart/messenger/xmpp/OnUpdateBlocklist.java
index 92e72cfa8..4b8d90ec7 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnUpdateBlocklist.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
 public interface OnUpdateBlocklist {
 	// Use an enum instead of a boolean to make sure we don't run into the boolean trap
diff --git a/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/PacketReceived.java
index d4502d734..b5b02b147 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java
+++ b/src/main/java/de/pixart/messenger/xmpp/PacketReceived.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
 public abstract interface PacketReceived {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index fec96969b..d8d4b9725 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp;
+package de.pixart.messenger.xmpp;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -53,43 +53,43 @@ import javax.net.ssl.X509KeyManager;
 import javax.net.ssl.X509TrustManager;
 
 import de.duenndns.ssl.MemorizingTrustManager;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.crypto.XmppDomainVerifier;
-import eu.siacs.conversations.crypto.sasl.DigestMd5;
-import eu.siacs.conversations.crypto.sasl.External;
-import eu.siacs.conversations.crypto.sasl.Plain;
-import eu.siacs.conversations.crypto.sasl.SaslMechanism;
-import eu.siacs.conversations.crypto.sasl.ScramSha1;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.ServiceDiscoveryResult;
-import eu.siacs.conversations.generator.IqGenerator;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.utils.DNSHelper;
-import eu.siacs.conversations.utils.SSLSocketHelper;
-import eu.siacs.conversations.utils.SocksSocketFactory;
-import eu.siacs.conversations.utils.Xmlns;
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xml.Tag;
-import eu.siacs.conversations.xml.TagWriter;
-import eu.siacs.conversations.xml.XmlReader;
-import eu.siacs.conversations.xmpp.forms.Data;
-import eu.siacs.conversations.xmpp.forms.Field;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.jingle.OnJinglePacketReceived;
-import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
-import eu.siacs.conversations.xmpp.stanzas.AbstractAcknowledgeableStanza;
-import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
-import eu.siacs.conversations.xmpp.stanzas.IqPacket;
-import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
-import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
-import eu.siacs.conversations.xmpp.stanzas.csi.ActivePacket;
-import eu.siacs.conversations.xmpp.stanzas.csi.InactivePacket;
-import eu.siacs.conversations.xmpp.stanzas.streammgmt.AckPacket;
-import eu.siacs.conversations.xmpp.stanzas.streammgmt.EnablePacket;
-import eu.siacs.conversations.xmpp.stanzas.streammgmt.RequestPacket;
-import eu.siacs.conversations.xmpp.stanzas.streammgmt.ResumePacket;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.crypto.XmppDomainVerifier;
+import de.pixart.messenger.crypto.sasl.DigestMd5;
+import de.pixart.messenger.crypto.sasl.External;
+import de.pixart.messenger.crypto.sasl.Plain;
+import de.pixart.messenger.crypto.sasl.SaslMechanism;
+import de.pixart.messenger.crypto.sasl.ScramSha1;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.entities.ServiceDiscoveryResult;
+import de.pixart.messenger.generator.IqGenerator;
+import de.pixart.messenger.services.XmppConnectionService;
+import de.pixart.messenger.utils.DNSHelper;
+import de.pixart.messenger.utils.SSLSocketHelper;
+import de.pixart.messenger.utils.SocksSocketFactory;
+import de.pixart.messenger.utils.Xmlns;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xml.Tag;
+import de.pixart.messenger.xml.TagWriter;
+import de.pixart.messenger.xml.XmlReader;
+import de.pixart.messenger.xmpp.forms.Data;
+import de.pixart.messenger.xmpp.forms.Field;
+import de.pixart.messenger.xmpp.jid.InvalidJidException;
+import de.pixart.messenger.xmpp.jid.Jid;
+import de.pixart.messenger.xmpp.jingle.OnJinglePacketReceived;
+import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket;
+import de.pixart.messenger.xmpp.stanzas.AbstractAcknowledgeableStanza;
+import de.pixart.messenger.xmpp.stanzas.AbstractStanza;
+import de.pixart.messenger.xmpp.stanzas.IqPacket;
+import de.pixart.messenger.xmpp.stanzas.MessagePacket;
+import de.pixart.messenger.xmpp.stanzas.PresencePacket;
+import de.pixart.messenger.xmpp.stanzas.csi.ActivePacket;
+import de.pixart.messenger.xmpp.stanzas.csi.InactivePacket;
+import de.pixart.messenger.xmpp.stanzas.streammgmt.AckPacket;
+import de.pixart.messenger.xmpp.stanzas.streammgmt.EnablePacket;
+import de.pixart.messenger.xmpp.stanzas.streammgmt.RequestPacket;
+import de.pixart.messenger.xmpp.stanzas.streammgmt.ResumePacket;
 
 public class XmppConnection implements Runnable {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java b/src/main/java/de/pixart/messenger/xmpp/chatstate/ChatState.java
index 3e371562c..c3117455c 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java
+++ b/src/main/java/de/pixart/messenger/xmpp/chatstate/ChatState.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.chatstate;
+package de.pixart.messenger.xmpp.chatstate;
 
-import eu.siacs.conversations.xml.Element;
+import de.pixart.messenger.xml.Element;
 
 public enum ChatState {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java b/src/main/java/de/pixart/messenger/xmpp/forms/Data.java
index c81c5a1f3..8ae70f9c7 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java
+++ b/src/main/java/de/pixart/messenger/xmpp/forms/Data.java
@@ -1,11 +1,11 @@
-package eu.siacs.conversations.xmpp.forms;
+package de.pixart.messenger.xmpp.forms;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import eu.siacs.conversations.xml.Element;
+import de.pixart.messenger.xml.Element;
 
 public class Data extends Element {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java b/src/main/java/de/pixart/messenger/xmpp/forms/Field.java
index 020b34b90..4cf5fc6b7 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java
+++ b/src/main/java/de/pixart/messenger/xmpp/forms/Field.java
@@ -1,11 +1,11 @@
-package eu.siacs.conversations.xmpp.forms;
+package de.pixart.messenger.xmpp.forms;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import eu.siacs.conversations.xml.Element;
+import de.pixart.messenger.xml.Element;
 
 public class Field extends Element {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jid/InvalidJidException.java b/src/main/java/de/pixart/messenger/xmpp/jid/InvalidJidException.java
index 164e88495..9f091063a 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jid/InvalidJidException.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jid/InvalidJidException.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.jid;
+package de.pixart.messenger.xmpp.jid;
 
 public class InvalidJidException extends Exception {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java b/src/main/java/de/pixart/messenger/xmpp/jid/Jid.java
index a15abe14a..2f5451364 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jid/Jid.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.jid;
+package de.pixart.messenger.xmpp.jid;
 
 import android.util.LruCache;
 
@@ -6,7 +6,7 @@ import net.java.otr4j.session.SessionID;
 
 import java.net.IDN;
 
-import eu.siacs.conversations.Config;
+import de.pixart.messenger.Config;
 import gnu.inet.encoding.Stringprep;
 import gnu.inet.encoding.StringprepException;
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java
index dcadb92f1..166fa6c69 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java
@@ -1,10 +1,10 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.jid.Jid;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.jid.Jid;
 
 public class JingleCandidate {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
index 86c445279..29c5acfb8 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
 import android.util.Log;
 import android.util.Pair;
@@ -15,28 +15,28 @@ import java.util.Locale;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.crypto.axolotl.AxolotlService;
-import eu.siacs.conversations.crypto.axolotl.OnMessageCreatedCallback;
-import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.Presence;
-import eu.siacs.conversations.entities.ServiceDiscoveryResult;
-import eu.siacs.conversations.entities.Transferable;
-import eu.siacs.conversations.entities.TransferablePlaceholder;
-import eu.siacs.conversations.persistance.FileBackend;
-import eu.siacs.conversations.services.AbstractConnectionManager;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.OnIqPacketReceived;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.jingle.stanzas.Content;
-import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
-import eu.siacs.conversations.xmpp.jingle.stanzas.Reason;
-import eu.siacs.conversations.xmpp.stanzas.IqPacket;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.crypto.axolotl.AxolotlService;
+import de.pixart.messenger.crypto.axolotl.OnMessageCreatedCallback;
+import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.entities.DownloadableFile;
+import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.entities.Presence;
+import de.pixart.messenger.entities.ServiceDiscoveryResult;
+import de.pixart.messenger.entities.Transferable;
+import de.pixart.messenger.entities.TransferablePlaceholder;
+import de.pixart.messenger.persistance.FileBackend;
+import de.pixart.messenger.services.AbstractConnectionManager;
+import de.pixart.messenger.services.XmppConnectionService;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.OnIqPacketReceived;
+import de.pixart.messenger.xmpp.jid.Jid;
+import de.pixart.messenger.xmpp.jingle.stanzas.Content;
+import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket;
+import de.pixart.messenger.xmpp.jingle.stanzas.Reason;
+import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class JingleConnection implements Transferable {
 	private final SimpleDateFormat fileDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java
index 0f0361cd3..b8f96bded 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
 import android.annotation.SuppressLint;
 import android.util.Log;
@@ -9,18 +9,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.Transferable;
-import eu.siacs.conversations.services.AbstractConnectionManager;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.utils.Xmlns;
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.OnIqPacketReceived;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
-import eu.siacs.conversations.xmpp.stanzas.IqPacket;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.entities.Transferable;
+import de.pixart.messenger.services.AbstractConnectionManager;
+import de.pixart.messenger.services.XmppConnectionService;
+import de.pixart.messenger.utils.Xmlns;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.OnIqPacketReceived;
+import de.pixart.messenger.xmpp.jid.Jid;
+import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket;
+import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class JingleConnectionManager extends AbstractConnectionManager {
 	private List<JingleConnection> connections = new CopyOnWriteArrayList<>();
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
index 0b0cb4083..e8b7d45d8 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
 import android.util.Base64;
 import android.util.Log;
@@ -10,15 +10,15 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.persistance.FileBackend;
-import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.OnIqPacketReceived;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.stanzas.IqPacket;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.DownloadableFile;
+import de.pixart.messenger.persistance.FileBackend;
+import de.pixart.messenger.utils.CryptoHelper;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.OnIqPacketReceived;
+import de.pixart.messenger.xmpp.jid.Jid;
+import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class JingleInbandTransport extends JingleTransport {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
index 140f20b91..4f3e78394 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
 import android.os.PowerManager;
 import android.util.Log;
@@ -12,12 +12,12 @@ import java.net.SocketAddress;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.persistance.FileBackend;
-import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.utils.SocksSocketFactory;
-import eu.siacs.conversations.xmpp.jingle.stanzas.Content;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.entities.DownloadableFile;
+import de.pixart.messenger.persistance.FileBackend;
+import de.pixart.messenger.utils.CryptoHelper;
+import de.pixart.messenger.utils.SocksSocketFactory;
+import de.pixart.messenger.xmpp.jingle.stanzas.Content;
 
 public class JingleSocks5Transport extends JingleTransport {
 	private JingleCandidate candidate;
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java
index e832d3f58..1ee97b415 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
-import eu.siacs.conversations.entities.DownloadableFile;
+import de.pixart.messenger.entities.DownloadableFile;
 
 public abstract class JingleTransport {
 	public abstract void connect(final OnTransportConnected callback);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java
index 91cba39f5..6bbf7111a 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
-import eu.siacs.conversations.entities.DownloadableFile;
+import de.pixart.messenger.entities.DownloadableFile;
 
 public interface OnFileTransmissionStatusChanged {
 	void onFileTransmitted(DownloadableFile file);
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java
new file mode 100644
index 000000000..82dfefa5e
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java
@@ -0,0 +1,9 @@
+package de.pixart.messenger.xmpp.jingle;
+
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.xmpp.PacketReceived;
+import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket;
+
+public interface OnJinglePacketReceived extends PacketReceived {
+	void onJinglePacketReceived(Account account, JinglePacket packet);
+}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java
index 76e337177..fad7bb4d4 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
 public interface OnPrimaryCandidateFound {
 	void onPrimaryCandidateFound(boolean success, JingleCandidate canditate);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java
index 38f03c5d0..10efd76d7 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.jingle;
+package de.pixart.messenger.xmpp.jingle;
 
 public interface OnTransportConnected {
 	public void failed();
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java
index 49f52bf33..bef32926f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java
@@ -1,7 +1,7 @@
-package eu.siacs.conversations.xmpp.jingle.stanzas;
+package de.pixart.messenger.xmpp.jingle.stanzas;
 
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.xml.Element;
+import de.pixart.messenger.entities.DownloadableFile;
+import de.pixart.messenger.xml.Element;
 
 public class Content extends Element {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java
index 4f73a83a7..971ab8e1b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java
@@ -1,8 +1,8 @@
-package eu.siacs.conversations.xmpp.jingle.stanzas;
+package de.pixart.messenger.xmpp.jingle.stanzas;
 
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.stanzas.IqPacket;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.jid.Jid;
+import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class JinglePacket extends IqPacket {
 	Content content = null;
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java
index 610d5e760..3c77a91a6 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.jingle.stanzas;
+package de.pixart.messenger.xmpp.jingle.stanzas;
 
-import eu.siacs.conversations.xml.Element;
+import de.pixart.messenger.xml.Element;
 
 public class Reason extends Element {
 	private Reason(String name) {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java b/src/main/java/de/pixart/messenger/xmpp/pep/Avatar.java
index 38bb5c8f9..1f28cd92d 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
+++ b/src/main/java/de/pixart/messenger/xmpp/pep/Avatar.java
@@ -1,9 +1,9 @@
-package eu.siacs.conversations.xmpp.pep;
+package de.pixart.messenger.xmpp.pep;
 
 import android.util.Base64;
 
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.jid.Jid;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.jid.Jid;
 
 public class Avatar {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractAcknowledgeableStanza.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java
index fa5e6fbdd..615c4dfbe 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractAcknowledgeableStanza.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.stanzas;
+package de.pixart.messenger.xmpp.stanzas;
 
-import eu.siacs.conversations.xml.Element;
+import de.pixart.messenger.xml.Element;
 
 abstract public class AbstractAcknowledgeableStanza extends AbstractStanza {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java
index a6144df28..a21d8b56d 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java
@@ -1,8 +1,8 @@
-package eu.siacs.conversations.xmpp.stanzas;
+package de.pixart.messenger.xmpp.stanzas;
 
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.jid.Jid;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.jid.Jid;
 
 public class AbstractStanza extends Element {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java
index 302dc78e8..b0a22c314 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.stanzas;
+package de.pixart.messenger.xmpp.stanzas;
 
-import eu.siacs.conversations.xml.Element;
+import de.pixart.messenger.xml.Element;
 
 public class IqPacket extends AbstractAcknowledgeableStanza {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/MessagePacket.java
index ac75a5e59..5af2d701b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/MessagePacket.java
@@ -1,9 +1,9 @@
-package eu.siacs.conversations.xmpp.stanzas;
+package de.pixart.messenger.xmpp.stanzas;
 
 import android.util.Pair;
 
-import eu.siacs.conversations.parser.AbstractParser;
-import eu.siacs.conversations.xml.Element;
+import de.pixart.messenger.parser.AbstractParser;
+import de.pixart.messenger.xml.Element;
 
 public class MessagePacket extends AbstractAcknowledgeableStanza {
 	public static final int TYPE_CHAT = 0;
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/PresencePacket.java
index c321498d8..6c816cac3 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/PresencePacket.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.xmpp.stanzas;
+package de.pixart.messenger.xmpp.stanzas;
 
 public class PresencePacket extends AbstractAcknowledgeableStanza {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/ActivePacket.java
index 78ab66d8f..10abb3499 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/ActivePacket.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.stanzas.csi;
+package de.pixart.messenger.xmpp.stanzas.csi;
 
-import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
+import de.pixart.messenger.xmpp.stanzas.AbstractStanza;
 
 public class ActivePacket extends AbstractStanza {
 	public ActivePacket() {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/InactivePacket.java
index f109280f1..ebaad8205 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/InactivePacket.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.stanzas.csi;
+package de.pixart.messenger.xmpp.stanzas.csi;
 
-import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
+import de.pixart.messenger.xmpp.stanzas.AbstractStanza;
 
 public class InactivePacket extends AbstractStanza {
 	public InactivePacket() {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/AckPacket.java
index f93b5d870..5c8131878 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/AckPacket.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.stanzas.streammgmt;
+package de.pixart.messenger.xmpp.stanzas.streammgmt;
 
-import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
+import de.pixart.messenger.xmpp.stanzas.AbstractStanza;
 
 public class AckPacket extends AbstractStanza {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/EnablePacket.java
index 78cd81edc..2beca0f20 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/EnablePacket.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.stanzas.streammgmt;
+package de.pixart.messenger.xmpp.stanzas.streammgmt;
 
-import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
+import de.pixart.messenger.xmpp.stanzas.AbstractStanza;
 
 public class EnablePacket extends AbstractStanza {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/RequestPacket.java
index 98cfc748b..19880f3c6 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/RequestPacket.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.stanzas.streammgmt;
+package de.pixart.messenger.xmpp.stanzas.streammgmt;
 
-import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
+import de.pixart.messenger.xmpp.stanzas.AbstractStanza;
 
 public class RequestPacket extends AbstractStanza {
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/ResumePacket.java
index 9cdcfa5ec..1c7f8d08c 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java
+++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/ResumePacket.java
@@ -1,6 +1,6 @@
-package eu.siacs.conversations.xmpp.stanzas.streammgmt;
+package de.pixart.messenger.xmpp.stanzas.streammgmt;
 
-import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
+import de.pixart.messenger.xmpp.stanzas.AbstractStanza;
 
 public class ResumePacket extends AbstractStanza {