diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java
index 1edf41a45..61d35b5e1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java
@@ -26,16 +26,16 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.ciphers.Aes256GcmNoPadding;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
-import org.jivesoftware.smackx.jet.internal.JetSecurity;
+import org.jivesoftware.smackx.jet.component.JetSecurity;
import org.jivesoftware.smackx.jet.provider.JetSecurityProvider;
import org.jivesoftware.smackx.jft.JingleFileTransferManager;
import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController;
-import org.jivesoftware.smackx.jft.internal.JingleOutgoingFileOffer;
+import org.jivesoftware.smackx.jft.component.JingleOutgoingFileOffer;
import org.jivesoftware.smackx.jingle.JingleDescriptionManager;
import org.jivesoftware.smackx.jingle.JingleManager;
import org.jivesoftware.smackx.jingle.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jingle.util.Role;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetSecurityAdapter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetSecurityAdapter.java
index ecf48f03d..6292555ba 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetSecurityAdapter.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetSecurityAdapter.java
@@ -17,7 +17,7 @@
package org.jivesoftware.smackx.jet;
import org.jivesoftware.smackx.jet.element.JetSecurityElement;
-import org.jivesoftware.smackx.jet.internal.JetSecurity;
+import org.jivesoftware.smackx.jet.component.JetSecurity;
import org.jivesoftware.smackx.jingle.adapter.JingleSecurityAdapter;
import org.jivesoftware.smackx.jingle.element.JingleContentSecurityElement;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/OutgoingJetOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/OutgoingJetOffer.java
index a44cae7d9..7fb2bf10c 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/OutgoingJetOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/OutgoingJetOffer.java
@@ -18,7 +18,7 @@ package org.jivesoftware.smackx.jet;
import java.io.File;
-import org.jivesoftware.smackx.jft.internal.JingleOutgoingFileOffer;
+import org.jivesoftware.smackx.jft.component.JingleOutgoingFileOffer;
/**
* Created by vanitas on 14.07.17.
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurity.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurity.java
similarity index 98%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurity.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurity.java
index f0fbf8b7d..d074e21d8 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurity.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurity.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jet.internal;
+package org.jivesoftware.smackx.jet.component;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
@@ -34,7 +34,7 @@ import org.jivesoftware.smackx.jet.JetManager;
import org.jivesoftware.smackx.jet.JingleEncryptionMethod;
import org.jivesoftware.smackx.jet.element.JetSecurityElement;
import org.jivesoftware.smackx.jingle.callbacks.JingleSecurityCallback;
-import org.jivesoftware.smackx.jingle.components.JingleSecurity;
+import org.jivesoftware.smackx.jingle.component.JingleSecurity;
import org.jivesoftware.smackx.jingle.element.JingleContentSecurityInfoElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurityBytestreamSession.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurityBytestreamSession.java
similarity index 92%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurityBytestreamSession.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurityBytestreamSession.java
index 9e7b543e5..6426e4c93 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurityBytestreamSession.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurityBytestreamSession.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jet.internal;
+package org.jivesoftware.smackx.jet.component;
import java.io.IOException;
import java.io.InputStream;
@@ -24,7 +24,7 @@ import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
-import org.jivesoftware.smackx.jingle.components.JingleSecurityBytestreamSession;
+import org.jivesoftware.smackx.jingle.component.JingleSecurityBytestreamSession;
public class JetSecurityBytestreamSession extends JingleSecurityBytestreamSession {
private final Cipher cipher;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/package-info.java
similarity index 93%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/package-info.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/package-info.java
index 7e86b0175..e3468c8c9 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/package-info.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/package-info.java
@@ -19,4 +19,4 @@
* Smack's API for XEP-XXXX: Jingle Encrypted Transfers.
* Internal classes.
*/
-package org.jivesoftware.smackx.jet.internal;
+package org.jivesoftware.smackx.jet.component;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/JetSecurityElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/JetSecurityElement.java
index e1478b2e4..ebfef2968 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/JetSecurityElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/JetSecurityElement.java
@@ -18,7 +18,7 @@ package org.jivesoftware.smackx.jet.element;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.util.XmlStringBuilder;
-import org.jivesoftware.smackx.jet.internal.JetSecurity;
+import org.jivesoftware.smackx.jet.component.JetSecurity;
import org.jivesoftware.smackx.jingle.element.JingleContentSecurityElement;
/**
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/JetSecurityProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/JetSecurityProvider.java
index 4a1d8cd8a..2b8e618c8 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/JetSecurityProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/JetSecurityProvider.java
@@ -24,7 +24,7 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.Objects;
import org.jivesoftware.smackx.jet.JetManager;
import org.jivesoftware.smackx.jet.element.JetSecurityElement;
-import org.jivesoftware.smackx.jet.internal.JetSecurity;
+import org.jivesoftware.smackx.jet.component.JetSecurity;
import org.jivesoftware.smackx.jingle.provider.JingleContentSecurityProvider;
import org.xmlpull.v1.XmlPullParser;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
index e2a422d1b..2f5d9952a 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java
@@ -32,20 +32,20 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.jft.adapter.JingleFileTransferAdapter;
import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController;
import org.jivesoftware.smackx.jft.controller.OutgoingFileRequestController;
-import org.jivesoftware.smackx.jft.internal.JingleFileTransfer;
-import org.jivesoftware.smackx.jft.internal.JingleIncomingFileOffer;
-import org.jivesoftware.smackx.jft.internal.JingleIncomingFileRequest;
-import org.jivesoftware.smackx.jft.internal.JingleOutgoingFileOffer;
-import org.jivesoftware.smackx.jft.internal.JingleOutgoingFileRequest;
-import org.jivesoftware.smackx.jft.internal.file.RemoteFile;
+import org.jivesoftware.smackx.jft.component.JingleFileTransfer;
+import org.jivesoftware.smackx.jft.component.JingleIncomingFileOffer;
+import org.jivesoftware.smackx.jft.component.JingleIncomingFileRequest;
+import org.jivesoftware.smackx.jft.component.JingleOutgoingFileOffer;
+import org.jivesoftware.smackx.jft.component.JingleOutgoingFileRequest;
+import org.jivesoftware.smackx.jft.component.file.RemoteFile;
import org.jivesoftware.smackx.jft.listener.IncomingFileOfferListener;
import org.jivesoftware.smackx.jft.listener.IncomingFileRequestListener;
import org.jivesoftware.smackx.jft.provider.JingleFileTransferProvider;
import org.jivesoftware.smackx.jingle.JingleDescriptionManager;
import org.jivesoftware.smackx.jingle.JingleManager;
import org.jivesoftware.smackx.jingle.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jingle.util.Role;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java
index dbc02cd4b..d56b1b461 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java
@@ -20,9 +20,9 @@ import java.util.List;
import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jft.element.JingleFileTransferElement;
-import org.jivesoftware.smackx.jft.internal.JingleFileTransfer;
-import org.jivesoftware.smackx.jft.internal.JingleIncomingFileOffer;
-import org.jivesoftware.smackx.jft.internal.JingleIncomingFileRequest;
+import org.jivesoftware.smackx.jft.component.JingleFileTransfer;
+import org.jivesoftware.smackx.jft.component.JingleIncomingFileOffer;
+import org.jivesoftware.smackx.jft.component.JingleIncomingFileRequest;
import org.jivesoftware.smackx.jingle.adapter.JingleDescriptionAdapter;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/AbstractJingleFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java
similarity index 86%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/AbstractJingleFileOffer.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java
index cc9037077..8420a548a 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/AbstractJingleFileOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal;
+package org.jivesoftware.smackx.jft.component;
-import org.jivesoftware.smackx.jft.internal.file.AbstractJingleFileTransferFile;
+import org.jivesoftware.smackx.jft.component.file.AbstractJingleFileTransferFile;
/**
* Created by vanitas on 22.07.17.
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/AbstractJingleFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java
similarity index 87%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/AbstractJingleFileRequest.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java
index 0ac399a3f..7b38dd428 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/AbstractJingleFileRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal;
+package org.jivesoftware.smackx.jft.component;
-import org.jivesoftware.smackx.jft.internal.file.AbstractJingleFileTransferFile;
+import org.jivesoftware.smackx.jft.component.file.AbstractJingleFileTransferFile;
/**
* Created by vanitas on 22.07.17.
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleFileTransfer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java
similarity index 93%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleFileTransfer.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java
index e9174a997..59a70394e 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleFileTransfer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal;
+package org.jivesoftware.smackx.jft.component;
import java.util.ArrayList;
import java.util.Collections;
@@ -22,9 +22,9 @@ import java.util.List;
import org.jivesoftware.smackx.jft.controller.JingleFileTransferController;
import org.jivesoftware.smackx.jft.element.JingleFileTransferElement;
-import org.jivesoftware.smackx.jft.internal.file.AbstractJingleFileTransferFile;
+import org.jivesoftware.smackx.jft.component.file.AbstractJingleFileTransferFile;
import org.jivesoftware.smackx.jft.listener.ProgressListener;
-import org.jivesoftware.smackx.jingle.components.JingleDescription;
+import org.jivesoftware.smackx.jingle.component.JingleDescription;
/**
* Created by vanitas on 22.07.17.
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleIncomingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java
similarity index 96%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleIncomingFileOffer.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java
index 2c6ff4e86..c10da5a63 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleIncomingFileOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal;
+package org.jivesoftware.smackx.jft.component;
import java.io.File;
import java.io.FileOutputStream;
@@ -31,8 +31,8 @@ import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
import org.jivesoftware.smackx.jft.controller.IncomingFileOfferController;
import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement;
-import org.jivesoftware.smackx.jft.internal.file.RemoteFile;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
+import org.jivesoftware.smackx.jft.component.file.RemoteFile;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleIncomingFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java
similarity index 94%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleIncomingFileRequest.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java
index 7de7348a5..968db9949 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleIncomingFileRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal;
+package org.jivesoftware.smackx.jft.component;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
import org.jivesoftware.smackx.jft.controller.IncomingFileRequestController;
import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jft.element.JingleFileTransferElement;
-import org.jivesoftware.smackx.jft.internal.file.RemoteFile;
+import org.jivesoftware.smackx.jft.component.file.RemoteFile;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java
similarity index 96%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileOffer.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java
index 6529e7719..22c48adfc 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal;
+package org.jivesoftware.smackx.jft.component;
import java.io.File;
import java.io.FileInputStream;
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController;
-import org.jivesoftware.smackx.jft.internal.file.LocalFile;
+import org.jivesoftware.smackx.jft.component.file.LocalFile;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java
similarity index 93%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileRequest.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java
index d33d39968..29caf6f44 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal;
+package org.jivesoftware.smackx.jft.component;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
import org.jivesoftware.smackx.jft.controller.OutgoingFileRequestController;
-import org.jivesoftware.smackx.jft.internal.file.RemoteFile;
+import org.jivesoftware.smackx.jft.component.file.RemoteFile;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/AbstractJingleFileTransferFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/AbstractJingleFileTransferFile.java
similarity index 96%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/AbstractJingleFileTransferFile.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/AbstractJingleFileTransferFile.java
index face210a8..82f113904 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/AbstractJingleFileTransferFile.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/AbstractJingleFileTransferFile.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal.file;
+package org.jivesoftware.smackx.jft.component.file;
import java.util.Date;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/LocalFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java
similarity index 97%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/LocalFile.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java
index 07fe11849..0f6096e86 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/LocalFile.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/LocalFile.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal.file;
+package org.jivesoftware.smackx.jft.component.file;
import java.io.File;
import java.util.Date;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/RemoteFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/RemoteFile.java
similarity index 96%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/RemoteFile.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/RemoteFile.java
index baaeed511..3fcc3f289 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/RemoteFile.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/RemoteFile.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jft.internal.file;
+package org.jivesoftware.smackx.jft.component.file;
import java.util.Date;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/package-info.java
similarity index 93%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/package-info.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/package-info.java
index 1ecf1ccf5..3ec853410 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/package-info.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/file/package-info.java
@@ -19,4 +19,4 @@
* Smack's API for XEP-0234: Jingle File Transfer.
* Classes that may represent files.
*/
-package org.jivesoftware.smackx.jft.internal.file;
+package org.jivesoftware.smackx.jft.component.file;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/package-info.java
similarity index 93%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/package-info.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/package-info.java
index 769833a43..f06a2d1e8 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/package-info.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/package-info.java
@@ -19,4 +19,4 @@
* Smack's API for XEP-0234: Jingle File Transfer.
* Internal classes.
*/
-package org.jivesoftware.smackx.jft.internal;
+package org.jivesoftware.smackx.jft.component;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/ChecksumElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/ChecksumElement.java
index 98effe300..78bbaa5ef 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/ChecksumElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/ChecksumElement.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.jft.element;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.util.Objects;
import org.jivesoftware.smack.util.XmlStringBuilder;
-import org.jivesoftware.smackx.jft.internal.JingleFileTransfer;
+import org.jivesoftware.smackx.jft.component.JingleFileTransfer;
import org.jivesoftware.smackx.jingle.element.JingleContentElement;
/**
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java
index c4601a318..7e2d1de93 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.jft.element;
import java.util.Collections;
import java.util.List;
-import org.jivesoftware.smackx.jft.internal.JingleFileTransfer;
+import org.jivesoftware.smackx.jft.component.JingleFileTransfer;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java
index 045fa475f..4e783f6fd 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java
@@ -27,7 +27,7 @@ import org.jivesoftware.smackx.hashes.provider.HashElementProvider;
import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jft.element.JingleFileTransferElement;
import org.jivesoftware.smackx.jft.element.Range;
-import org.jivesoftware.smackx.jft.internal.JingleFileTransfer;
+import org.jivesoftware.smackx.jft.component.JingleFileTransfer;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import org.jivesoftware.smackx.jingle.provider.JingleContentDescriptionProvider;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/Callback.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/Callback.java
index cdb20eecc..78360ab7f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/Callback.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/Callback.java
@@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jingle;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
/**
* User callback that the user can use to control a jingle content.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleDescriptionManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleDescriptionManager.java
index 6acc585d8..affc24080 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleDescriptionManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleDescriptionManager.java
@@ -16,8 +16,8 @@
*/
package org.jivesoftware.smackx.jingle;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
/**
* Manager for JingleDescription components.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
index 90fb825ca..04617bf54 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
@@ -36,7 +36,7 @@ import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.jingle.adapter.JingleDescriptionAdapter;
import org.jivesoftware.smackx.jingle.adapter.JingleSecurityAdapter;
import org.jivesoftware.smackx.jingle.adapter.JingleTransportAdapter;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
import org.jivesoftware.smackx.jingle.element.JingleAction;
import org.jivesoftware.smackx.jingle.element.JingleElement;
import org.jivesoftware.smackx.jingle.element.JingleReasonElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportManager.java
index 1a68d0225..89aa366ce 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportManager.java
@@ -16,8 +16,8 @@
*/
package org.jivesoftware.smackx.jingle;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
-import org.jivesoftware.smackx.jingle.components.JingleTransport;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleTransport;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
/**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleDescriptionAdapter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleDescriptionAdapter.java
index 140f6dd52..5d9aa4bdd 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleDescriptionAdapter.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleDescriptionAdapter.java
@@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jingle.adapter;
-import org.jivesoftware.smackx.jingle.components.JingleDescription;
+import org.jivesoftware.smackx.jingle.component.JingleDescription;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
import org.jivesoftware.smackx.jingle.element.JingleContentElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleSecurityAdapter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleSecurityAdapter.java
index a7fe5bb6a..683049919 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleSecurityAdapter.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleSecurityAdapter.java
@@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jingle.adapter;
-import org.jivesoftware.smackx.jingle.components.JingleSecurity;
+import org.jivesoftware.smackx.jingle.component.JingleSecurity;
import org.jivesoftware.smackx.jingle.element.JingleContentSecurityElement;
/**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleTransportAdapter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleTransportAdapter.java
index f5f8c6f2d..4a550ceea 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleTransportAdapter.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleTransportAdapter.java
@@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.jingle.adapter;
-import org.jivesoftware.smackx.jingle.components.JingleTransport;
+import org.jivesoftware.smackx.jingle.component.JingleTransport;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
/**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleContent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java
similarity index 99%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleContent.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java
index b66886a83..3026667e8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleContent.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleDescription.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleDescription.java
similarity index 96%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleDescription.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleDescription.java
index b5491b8f6..5c6646c39 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleDescription.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleDescription.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSecurity.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSecurity.java
similarity index 97%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSecurity.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSecurity.java
index 153cda5b2..762e4d271 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSecurity.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSecurity.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSecurityBytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSecurityBytestreamSession.java
similarity index 95%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSecurityBytestreamSession.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSecurityBytestreamSession.java
index 847065163..0988dd07b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSecurityBytestreamSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSecurityBytestreamSession.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
import java.io.IOException;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java
similarity index 99%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSession.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java
index 0e733a8b3..458533831 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransport.java
similarity index 98%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleTransport.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransport.java
index 0a22ef96c..7520b0ba1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleTransport.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
import java.util.ArrayList;
import java.util.List;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleTransportCandidate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransportCandidate.java
similarity index 96%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleTransportCandidate.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransportCandidate.java
index 839157285..7a6af1b29 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleTransportCandidate.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleTransportCandidate.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportCandidateElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/PendingJingleAction.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/PendingJingleAction.java
similarity index 97%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/PendingJingleAction.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/PendingJingleAction.java
index 748ef478a..2d1c677e2 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/PendingJingleAction.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/PendingJingleAction.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
import org.jivesoftware.smackx.jingle.element.JingleAction;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/package-info.java
similarity index 93%
rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/package-info.java
rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/package-info.java
index eb37064f7..c7dc0690f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/package-info.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/package-info.java
@@ -19,4 +19,4 @@
* Smack's API for XEP-0166: Jingle.
* Internal components.
*/
-package org.jivesoftware.smackx.jingle.components;
+package org.jivesoftware.smackx.jingle.component;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java
index 818a9121b..a6a978a2d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransport.java
@@ -30,9 +30,9 @@ import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamListener;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest;
import org.jivesoftware.smackx.jingle.callbacks.JingleTransportCallback;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
-import org.jivesoftware.smackx.jingle.components.JingleTransport;
-import org.jivesoftware.smackx.jingle.components.JingleTransportCandidate;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleTransport;
+import org.jivesoftware.smackx.jingle.component.JingleTransportCandidate;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportInfoElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportManager.java
index 893cab8ed..b6dba22e7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportManager.java
@@ -23,8 +23,8 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.jingle.JingleManager;
import org.jivesoftware.smackx.jingle.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
-import org.jivesoftware.smackx.jingle.components.JingleTransport;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleTransport;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.transport.jingle_ibb.provider.JingleIBBTransportProvider;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
index cf3bb6ac1..7bd1cb1e8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
@@ -36,9 +36,9 @@ import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
import org.jivesoftware.smackx.jingle.JingleManager;
import org.jivesoftware.smackx.jingle.callbacks.JingleTransportCallback;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
-import org.jivesoftware.smackx.jingle.components.JingleTransport;
-import org.jivesoftware.smackx.jingle.components.JingleTransportCandidate;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleTransport;
+import org.jivesoftware.smackx.jingle.component.JingleTransportCandidate;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportCandidateElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportInfoElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportAdapter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportAdapter.java
index 09b3ef340..9cf55b364 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportAdapter.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportAdapter.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.jingle.transport.jingle_s5b;
import java.util.ArrayList;
import org.jivesoftware.smackx.jingle.adapter.JingleTransportAdapter;
-import org.jivesoftware.smackx.jingle.components.JingleTransportCandidate;
+import org.jivesoftware.smackx.jingle.component.JingleTransportCandidate;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportCandidateElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportCandidateElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java
index c31b52d21..e2941364e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java
@@ -27,9 +27,9 @@ import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5ClientForInitiator;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
-import org.jivesoftware.smackx.jingle.components.JingleTransportCandidate;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleTransportCandidate;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportCandidateElement;
/**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java
index 398b79d33..389ad3497 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportManager.java
@@ -37,10 +37,10 @@ import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.jingle.JingleManager;
import org.jivesoftware.smackx.jingle.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
-import org.jivesoftware.smackx.jingle.components.JingleTransport;
-import org.jivesoftware.smackx.jingle.components.JingleTransportCandidate;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleTransport;
+import org.jivesoftware.smackx.jingle.component.JingleTransportCandidate;
import org.jivesoftware.smackx.jingle.element.JingleAction;
import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleTransportTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleTransportTest.java
index 6906cd0e3..ee386c6af 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleTransportTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleTransportTest.java
@@ -30,9 +30,9 @@ import org.jivesoftware.smackx.bytestreams.BytestreamSession;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy;
import org.jivesoftware.smackx.jingle.JingleManager;
import org.jivesoftware.smackx.jingle.callbacks.JingleTransportCallback;
-import org.jivesoftware.smackx.jingle.components.JingleContent;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
-import org.jivesoftware.smackx.jingle.components.JingleTransport;
+import org.jivesoftware.smackx.jingle.component.JingleContent;
+import org.jivesoftware.smackx.jingle.component.JingleSession;
+import org.jivesoftware.smackx.jingle.component.JingleTransport;
import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jingle.transport.jingle_ibb.JingleIBBTransport;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.JingleS5BTransport;