19 files changed, 24 insertions, 25 deletions
diff --git a/juick-server/src/main/java/com/juick/server/XMPPBot.java b/juick-server/src/main/java/com/juick/server/XMPPBot.java
index 21138607..a515d066 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPBot.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPBot.java
@@ -19,7 +19,7 @@ package com.juick.server;
 
 import com.juick.Tag;
 import com.juick.User;
-import com.juick.xmpp.s2s.StanzaListener;
+import com.juick.server.xmpp.s2s.StanzaListener;
 import com.juick.formatters.PlainTextFormatter;
 import com.juick.server.helpers.TagStats;
 import com.juick.server.protocol.annotation.UserCommand;
diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index f5448880..09c30899 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -19,7 +19,7 @@ package com.juick.server;
 
 import com.juick.Attachment;
 import com.juick.User;
-import com.juick.xmpp.s2s.BasicXmppSession;
+import com.juick.server.xmpp.s2s.BasicXmppSession;
 import com.juick.server.helpers.UserInfo;
 import com.juick.service.MessagesService;
 import com.juick.service.SubscriptionService;
diff --git a/juick-server/src/main/java/com/juick/server/XMPPServer.java b/juick-server/src/main/java/com/juick/server/XMPPServer.java
index 01437232..86a855a7 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPServer.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPServer.java
@@ -17,9 +17,9 @@
 
 package com.juick.server;
 
-import com.juick.xmpp.s2s.*;
+import com.juick.server.xmpp.s2s.*;
 import com.juick.service.UserService;
-import com.juick.xmpp.extensions.JuickMessage;
+import com.juick.server.xmpp.extensions.JuickMessage;
 import com.juick.xmpp.extensions.StreamError;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/juick-server/src/main/java/com/juick/server/api/Index.java b/juick-server/src/main/java/com/juick/server/api/Index.java
index b1d87f67..be79bf98 100644
--- a/juick-server/src/main/java/com/juick/server/api/Index.java
+++ b/juick-server/src/main/java/com/juick/server/api/Index.java
@@ -20,7 +20,7 @@ package com.juick.server.api;
 import com.juick.Status;
 import com.juick.server.WebsocketManager;
 import com.juick.server.XMPPServer;
-import com.juick.xmpp.helpers.XMPPStatus;
+import com.juick.server.xmpp.helpers.XMPPStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
index 21c1238b..55050f7e 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
@@ -17,13 +17,12 @@
 
 package com.juick.server.configuration;
 
-import com.juick.server.ServerManager;
 import com.juick.server.WebsocketManager;
 import com.juick.server.component.JuickServerComponent;
 import com.juick.server.component.JuickServerReconnectManager;
 import com.juick.service.UserService;
-import com.juick.xmpp.helpers.JidConverter;
-import com.juick.xmpp.s2s.BasicXmppSession;
+import com.juick.server.xmpp.helpers.JidConverter;
+import com.juick.server.xmpp.s2s.BasicXmppSession;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.*;
 import org.springframework.core.convert.ConversionService;
diff --git a/juick-server/src/main/java/com/juick/server/util/JsonpAdvice.java b/juick-server/src/main/java/com/juick/server/configuration/JsonpAdvice.java
index 457a7df7..5cee2974 100644
--- a/juick-server/src/main/java/com/juick/server/util/JsonpAdvice.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/JsonpAdvice.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.server.util;
+package com.juick.server.configuration;
 
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.AbstractJsonpResponseBodyAdvice;
diff --git a/juick-server/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/juick-server/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
index c28eee14..6956a99a 100644
--- a/juick-server/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.juick.xmpp.extensions;
+package com.juick.server.xmpp.extensions;
 
 import com.juick.Tag;
 import com.juick.xmpp.StanzaChild;
diff --git a/juick-server/src/main/java/com/juick/xmpp/extensions/JuickUser.java b/juick-server/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
index 10d2b564..534efcc9 100644
--- a/juick-server/src/main/java/com/juick/xmpp/extensions/JuickUser.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.juick.xmpp.extensions;
+package com.juick.server.xmpp.extensions;
 import com.juick.xmpp.StanzaChild;
 import com.juick.xmpp.utils.XmlUtils;
 import org.apache.commons.text.StringEscapeUtils;
diff --git a/juick-server/src/main/java/com/juick/xmpp/helpers/JidConverter.java b/juick-server/src/main/java/com/juick/server/xmpp/helpers/JidConverter.java
index 253c50f8..ca25c4b8 100644
--- a/juick-server/src/main/java/com/juick/xmpp/helpers/JidConverter.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/helpers/JidConverter.java
@@ -1,4 +1,4 @@
-package com.juick.xmpp.helpers;
+package com.juick.server.xmpp.helpers;
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.lang.Nullable;
diff --git a/juick-server/src/main/java/com/juick/xmpp/helpers/XMPPStatus.java b/juick-server/src/main/java/com/juick/server/xmpp/helpers/XMPPStatus.java
index a7fa1bce..7978ceb3 100644
--- a/juick-server/src/main/java/com/juick/xmpp/helpers/XMPPStatus.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/helpers/XMPPStatus.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.helpers;
+package com.juick.server.xmpp.helpers;
 
-import com.juick.xmpp.s2s.ConnectionIn;
-import com.juick.xmpp.s2s.ConnectionOut;
+import com.juick.server.xmpp.s2s.ConnectionIn;
+import com.juick.server.xmpp.s2s.ConnectionOut;
 
 import java.util.List;
 import java.util.Set;
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/BasicXmppSession.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
index 856d757b..647f2717 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/BasicXmppSession.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.s2s;
+package com.juick.server.xmpp.s2s;
 
 import rocks.xmpp.addr.Jid;
 import rocks.xmpp.core.XmppException;
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/CacheEntry.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/CacheEntry.java
index 580682cb..33e875bd 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/CacheEntry.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/CacheEntry.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.s2s;
+package com.juick.server.xmpp.s2s;
 
 import rocks.xmpp.addr.Jid;
 
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/Connection.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java
index 638e3b58..d745a406 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/Connection.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/Connection.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.s2s;
+package com.juick.server.xmpp.s2s;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.juick.server.XMPPServer;
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java
index 94da89d2..a658dbde 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionIn.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.s2s;
+package com.juick.server.xmpp.s2s;
 
 import com.juick.server.XMPPServer;
 import com.juick.xmpp.extensions.StreamError;
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionListener.java
index 76bc8bdc..efac8732 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionListener.java
@@ -1,4 +1,4 @@
-package com.juick.xmpp.s2s;
+package com.juick.server.xmpp.s2s;
 
 import com.juick.xmpp.extensions.StreamError;
 
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
index 6c8c9782..fb95f0e4 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.s2s;
+package com.juick.server.xmpp.s2s;
 
-import com.juick.xmpp.s2s.util.DialbackUtils;
+import com.juick.server.xmpp.s2s.util.DialbackUtils;
 import com.juick.xmpp.Stream;
 import com.juick.xmpp.extensions.StreamError;
 import com.juick.xmpp.extensions.StreamFeatures;
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/DNSQueries.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/DNSQueries.java
index 47b01d7e..3d12ed35 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/DNSQueries.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/DNSQueries.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.s2s;
+package com.juick.server.xmpp.s2s;
 
 import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/StanzaListener.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/StanzaListener.java
index 324a0aa8..6932298f 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/StanzaListener.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/StanzaListener.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.s2s;
+package com.juick.server.xmpp.s2s;
 
 
 import rocks.xmpp.core.stanza.model.Stanza;
diff --git a/juick-server/src/main/java/com/juick/xmpp/s2s/util/DialbackUtils.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java
index a7646deb..71405f34 100644
--- a/juick-server/src/main/java/com/juick/xmpp/s2s/util/DialbackUtils.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xmpp.s2s.util;
+package com.juick.server.xmpp.s2s.util;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.codec.digest.HmacUtils;