diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/CallPanelButton.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/CallPanelButton.java
similarity index 98%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/CallPanelButton.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/CallPanelButton.java
index 305d1cf80..f17a10855 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/CallPanelButton.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/CallPanelButton.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 
 import java.awt.Color;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/ControlPanel.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/ControlPanel.java
similarity index 97%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/ControlPanel.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/ControlPanel.java
index e1fbe350f..743553b2c 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/ControlPanel.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/ControlPanel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import javax.swing.JPanel;
 import javax.swing.BorderFactory;
@@ -50,4 +50,4 @@ public class ControlPanel extends JPanel {
 
         g.drawImage(bufferedImage, 0, 0, getWidth(), getHeight(), null);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/GenericNotification.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/GenericNotification.java
similarity index 98%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/GenericNotification.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/GenericNotification.java
index a4fd3889b..b3daa681a 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/GenericNotification.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/GenericNotification.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import org.jivesoftware.spark.component.FileDragLabel;
 
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCall.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/IncomingCall.java
similarity index 99%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCall.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/IncomingCall.java
index 3c557562b..c79289a75 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCall.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/IncomingCall.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import org.jivesoftware.resource.SparkRes;
 import org.jivesoftware.smack.SmackException;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/IncomingCallUI.java
similarity index 99%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/IncomingCallUI.java
index fe42265e4..0bc4923b0 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/IncomingCallUI.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JavaMixer.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JavaMixer.java
similarity index 99%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JavaMixer.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JavaMixer.java
index 086cbb33f..561c4b368 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JavaMixer.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JavaMixer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import javax.sound.sampled.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JinglePhoneRes.java
similarity index 94%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JinglePhoneRes.java
index edb388fa1..13f555dad 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JinglePhoneRes.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import javax.swing.*;
 import java.util.PropertyResourceBundle;
@@ -37,7 +37,7 @@ public class JinglePhoneRes {
     static ClassLoader cl = JinglePhoneRes.class.getClassLoader();
 
     static {
-        JinglePhoneRes.prb = (PropertyResourceBundle) ResourceBundle.getBundle("org/jivesoftware/sparkplugin/jingle");
+        JinglePhoneRes.prb = (PropertyResourceBundle) ResourceBundle.getBundle("org/jivesoftware/spark/plugin/jingle/jingle");
     }
 
     public static final String getString(String propertyName) {
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePlugin.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JinglePlugin.java
similarity index 99%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePlugin.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JinglePlugin.java
index 876c9d7f3..f6e4941df 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePlugin.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JinglePlugin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import org.jivesoftware.resource.SparkRes;
 import org.jivesoftware.smack.*;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleResources.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleResources.java
similarity index 96%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleResources.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleResources.java
index 6cf54d804..067e5a0db 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleResources.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleResources.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import java.text.MessageFormat;
 import java.util.PropertyResourceBundle;
@@ -48,4 +48,4 @@ public class JingleResources {
         
         return MessageFormat.format(str, obj);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleRoom.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleRoom.java
similarity index 99%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleRoom.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleRoom.java
index 40d96f658..57368a937 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleRoom.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleRoom.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -339,4 +339,4 @@ public class JingleRoom extends JPanel {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleStateManager.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleStateManager.java
similarity index 98%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleStateManager.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleStateManager.java
index e0a705d1e..457bd1556 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleStateManager.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleStateManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import org.jivesoftware.spark.ui.ChatRoom;
 
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleTabHandler.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleTabHandler.java
similarity index 96%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleTabHandler.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleTabHandler.java
index 4ab597c1d..6231d8541 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JingleTabHandler.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/JingleTabHandler.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import org.jivesoftware.resource.SparkRes;
 import org.jivesoftware.spark.SparkManager;
 import org.jivesoftware.spark.component.tabbedPane.SparkTab;
 import org.jivesoftware.spark.ui.ChatRoom;
 import org.jivesoftware.spark.ui.SparkTabHandler;
-import org.jivesoftware.sparkplugin.JingleStateManager.JingleRoomState;
+import org.jivesoftware.spark.plugin.jingle.JingleStateManager.JingleRoomState;
 
 import java.awt.Color;
 import java.awt.Component;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/OutgoingCall.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/OutgoingCall.java
similarity index 99%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/OutgoingCall.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/OutgoingCall.java
index dc3f40f24..276ee0ca1 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/OutgoingCall.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/OutgoingCall.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import java.applet.Applet;
 import java.applet.AudioClip;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/PreviousConversationPanel.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/PreviousConversationPanel.java
similarity index 99%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/PreviousConversationPanel.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/PreviousConversationPanel.java
index d9b1d94f7..c31257e26 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/PreviousConversationPanel.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/PreviousConversationPanel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import org.jivesoftware.spark.component.TimeTrackingLabel;
 import org.jivesoftware.spark.component.VerticalFlowLayout;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/RosterMemberCallButton.java b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/RosterMemberCallButton.java
similarity index 98%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/RosterMemberCallButton.java
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/RosterMemberCallButton.java
index bca7a464b..8eed3efeb 100644
--- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/RosterMemberCallButton.java
+++ b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/RosterMemberCallButton.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.sparkplugin;
+package org.jivesoftware.spark.plugin.jingle;
 
 import java.awt.Color;
 import java.awt.Cursor;
diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/jingle.properties b/plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/jingle.properties
similarity index 100%
rename from plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/jingle.properties
rename to plugins/jingle/src/main/java/org/jivesoftware/spark/plugin/jingle/jingle.properties
diff --git a/plugins/jingle/src/main/plugin-metadata/plugin.xml b/plugins/jingle/src/main/plugin-metadata/plugin.xml
index 1b91df0f1..0a20e7ad5 100644
--- a/plugins/jingle/src/main/plugin-metadata/plugin.xml
+++ b/plugins/jingle/src/main/plugin-metadata/plugin.xml
@@ -5,7 +5,7 @@
     <author>Derek DeMoro</author>
     <homePage>https://IgniteRealtime.org</homePage>
     <email>support@IgniteRealtime.org</email>
-    <class>org.jivesoftware.sparkplugin.JinglePlugin</class>
+    <class>org.jivesoftware.spark.plugin.jingle.JinglePlugin</class>
     <minSparkVersion>3.1.0</minSparkVersion>
     <os>Windows,mac,linux</os>
     <java>11</java>