diff --git a/build/resources/META-INF/smack-config.xml b/build/resources/META-INF/smack-config.xml
index 5378c6f47..34c5422ce 100644
--- a/build/resources/META-INF/smack-config.xml
+++ b/build/resources/META-INF/smack-config.xml
@@ -8,8 +8,8 @@
         <className>org.jivesoftware.smack.PrivacyListManager</className>        
         <className>org.jivesoftware.smackx.XHTMLManager</className>
         <className>org.jivesoftware.smackx.muc.MultiUserChat</className>
-        <className>org.jivesoftware.smackx.ibb.InBandBytestreamManager</className>
-        <className>org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager</className>    
+        <className>org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager</className>
+        <className>org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager</className>    
         <className>org.jivesoftware.smackx.filetransfer.FileTransferManager</className>
         <className>org.jivesoftware.smackx.LastActivityManager</className>
         <className>org.jivesoftware.smack.ReconnectionManager</className>    
diff --git a/build/resources/META-INF/smack.providers b/build/resources/META-INF/smack.providers
index f4f992d4d..9f0f4f15a 100644
--- a/build/resources/META-INF/smack.providers
+++ b/build/resources/META-INF/smack.providers
@@ -158,7 +158,7 @@
         <className>org.jivesoftware.smackx.packet.OfflineMessageInfo$Provider</className>
     </extensionProvider>
 
-     <!-- Last Activity -->
+    <!-- Last Activity -->
     <iqProvider>
         <elementName>query</elementName>
         <namespace>jabber:iq:last</namespace>
@@ -186,7 +186,7 @@
         <className>org.jivesoftware.smackx.provider.MultipleAddressesProvider</className>
     </extensionProvider>
 
-        <!-- FileTransfer -->
+    <!-- FileTransfer -->
     <iqProvider>
     	<elementName>si</elementName>
     	<namespace>http://jabber.org/protocol/si</namespace>
@@ -196,31 +196,31 @@
     <iqProvider>
     	<elementName>query</elementName>
     	<namespace>http://jabber.org/protocol/bytestreams</namespace>
-    	<className>org.jivesoftware.smackx.socks5bytestream.provider.BytestreamsProvider</className>
+    	<className>org.jivesoftware.smackx.bytestreams.socks5.provider.BytestreamsProvider</className>
     </iqProvider>
 
     <iqProvider>
     	<elementName>open</elementName>
     	<namespace>http://jabber.org/protocol/ibb</namespace>
-    	<className>org.jivesoftware.smackx.ibb.provider.OpenIQProvider</className>
+    	<className>org.jivesoftware.smackx.bytestreams.ibb.provider.OpenIQProvider</className>
     </iqProvider>
 
     <iqProvider>
       <elementName>data</elementName>
       <namespace>http://jabber.org/protocol/ibb</namespace>
-      <className>org.jivesoftware.smackx.ibb.provider.DataPacketProvider</className>
+      <className>org.jivesoftware.smackx.bytestreams.ibb.provider.DataPacketProvider</className>
     </iqProvider>
 
     <iqProvider>
     	<elementName>close</elementName>
     	<namespace>http://jabber.org/protocol/ibb</namespace>
-    	<className>org.jivesoftware.smackx.ibb.provider.CloseIQProvider</className>
+    	<className>org.jivesoftware.smackx.bytestreams.ibb.provider.CloseIQProvider</className>
     </iqProvider>
     
     <extensionProvider>
         <elementName>data</elementName>
         <namespace>http://jabber.org/protocol/ibb</namespace>
-        <className>org.jivesoftware.smackx.ibb.provider.DataPacketProvider</className>
+        <className>org.jivesoftware.smackx.bytestreams.ibb.provider.DataPacketProvider</className>
     </extensionProvider>
 
     <!-- Privacy -->
@@ -497,7 +497,7 @@
         <className>org.jivesoftware.smackx.provider.HeaderProvider</className>
     </extensionProvider>
 
-	<!-- XEP-0060 pubsub -->
+    <!-- XEP-0060 pubsub -->
     <iqProvider>
         <elementName>pubsub</elementName>
         <namespace>http://jabber.org/protocol/pubsub</namespace>
@@ -552,7 +552,7 @@
         <className>org.jivesoftware.smackx.pubsub.provider.FormNodeProvider</className>
     </extensionProvider>
 	
-	<!-- XEP-0060 pubsub#owner -->
+    <!-- XEP-0060 pubsub#owner -->
     <iqProvider>
         <elementName>pubsub</elementName>
         <namespace>http://jabber.org/protocol/pubsub#owner</namespace>
@@ -571,7 +571,7 @@
         <className>org.jivesoftware.smackx.pubsub.provider.FormNodeProvider</className>
     </extensionProvider>
 	
-	<!-- XEP-0060 pubsub#event -->
+    <!-- XEP-0060 pubsub#event -->
     <extensionProvider>
     	<elementName>event</elementName>
         <namespace>http://jabber.org/protocol/pubsub#event</namespace>
@@ -627,7 +627,7 @@
         <className>org.jivesoftware.smackx.packet.Nick$Provider</className>
     </extensionProvider>
 	
-	 <!-- Attention -->
+    <!-- Attention -->
     <extensionProvider>
         <elementName>attention</elementName>
         <namespace>urn:xmpp:attention:0</namespace>
diff --git a/source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java b/source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
index 5cc698008..be78255d5 100644
--- a/source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
+++ b/source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
@@ -13,10 +13,10 @@
  */
 package org.jivesoftware.smackx.bytestreams;
 
-import org.jivesoftware.smackx.ibb.InBandBytestreamListener;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamListener;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamListener;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamListener;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
 
 /**
  * BytestreamListener are notified if a remote user wants to initiate a bytestream. Implement this
diff --git a/source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java
index cd61c5a0c..ca6bbc602 100644
--- a/source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java
+++ b/source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java
@@ -16,8 +16,8 @@ package org.jivesoftware.smackx.bytestreams;
 import java.io.IOException;
 
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
 
 /**
  * BytestreamManager provides a generic interface for bytestream managers.
diff --git a/source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java b/source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
index e10a65994..e368bad99 100644
--- a/source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
+++ b/source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
@@ -14,8 +14,8 @@
 package org.jivesoftware.smackx.bytestreams;
 
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.ibb.InBandBytestreamRequest;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest;
 
 /**
  * BytestreamRequest provides an interface to handle incoming bytestream requests.
diff --git a/source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java b/source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
index a0b9b3805..7aafc3513 100644
--- a/source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
+++ b/source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
@@ -17,8 +17,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.jivesoftware.smackx.ibb.InBandBytestreamSession;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamSession;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession;
 
 /**
  * BytestreamSession provides an interface for established bytestream sessions.
diff --git a/source/org/jivesoftware/smackx/ibb/CloseListener.java b/source/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java
similarity index 93%
rename from source/org/jivesoftware/smackx/ibb/CloseListener.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java
index 8bec215b6..7690e9537 100644
--- a/source/org/jivesoftware/smackx/ibb/CloseListener.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.filter.AndFilter;
@@ -20,7 +20,7 @@ import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
-import org.jivesoftware.smackx.ibb.packet.Close;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
 
 /**
  * CloseListener handles all In-Band Bytestream close requests.
diff --git a/source/org/jivesoftware/smackx/ibb/DataListener.java b/source/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
similarity index 93%
rename from source/org/jivesoftware/smackx/ibb/DataListener.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
index 16c132eab..166c14647 100644
--- a/source/org/jivesoftware/smackx/ibb/DataListener.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.filter.AndFilter;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.Packet;
-import org.jivesoftware.smackx.ibb.packet.Data;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
 
 /**
  * DataListener handles all In-Band Bytestream IQ stanzas containing a data
diff --git a/source/org/jivesoftware/smackx/ibb/InBandBytestreamListener.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java
similarity index 94%
rename from source/org/jivesoftware/smackx/ibb/InBandBytestreamListener.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java
index 3aed11177..68791a6f3 100644
--- a/source/org/jivesoftware/smackx/ibb/InBandBytestreamListener.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
diff --git a/source/org/jivesoftware/smackx/ibb/InBandBytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
similarity index 96%
rename from source/org/jivesoftware/smackx/ibb/InBandBytestreamManager.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index 835f4f959..6c4e1b57a 100644
--- a/source/org/jivesoftware/smackx/ibb/InBandBytestreamManager.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -29,8 +29,8 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
 import org.jivesoftware.smackx.bytestreams.BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.jivesoftware.smackx.filetransfer.FileTransferManager;
-import org.jivesoftware.smackx.ibb.packet.Open;
 import org.jivesoftware.smackx.packet.SyncPacketSend;
 
 /**
diff --git a/source/org/jivesoftware/smackx/ibb/InBandBytestreamRequest.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
similarity index 93%
rename from source/org/jivesoftware/smackx/ibb/InBandBytestreamRequest.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
index 3fabdfa26..5bc689a4a 100644
--- a/source/org/jivesoftware/smackx/ibb/InBandBytestreamRequest.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
 /**
  * InBandBytestreamRequest class handles incoming In-Band Bytestream requests.
diff --git a/source/org/jivesoftware/smackx/ibb/InBandBytestreamSession.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
similarity index 96%
rename from source/org/jivesoftware/smackx/ibb/InBandBytestreamSession.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
index 8cd63f8c3..e3977a4c1 100644
--- a/source/org/jivesoftware/smackx/ibb/InBandBytestreamSession.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,10 +34,10 @@ import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.bytestreams.BytestreamSession;
-import org.jivesoftware.smackx.ibb.packet.Close;
-import org.jivesoftware.smackx.ibb.packet.Data;
-import org.jivesoftware.smackx.ibb.packet.DataPacketExtension;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.jivesoftware.smackx.packet.SyncPacketSend;
 
 /**
diff --git a/source/org/jivesoftware/smackx/ibb/InitiationListener.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java
similarity index 95%
rename from source/org/jivesoftware/smackx/ibb/InitiationListener.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java
index 820db0387..0ecb08156 100644
--- a/source/org/jivesoftware/smackx/ibb/InitiationListener.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -24,7 +24,7 @@ import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
 /**
  * InitiationListener handles all incoming In-Band Bytestream open requests. If there are no
diff --git a/source/org/jivesoftware/smackx/ibb/packet/Close.java b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java
similarity index 90%
rename from source/org/jivesoftware/smackx/ibb/packet/Close.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java
index ff0997ff1..9a78d736d 100644
--- a/source/org/jivesoftware/smackx/ibb/packet/Close.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.packet;
+package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
 
 /**
  * Represents a request to close an In-Band Bytestream.
diff --git a/source/org/jivesoftware/smackx/ibb/packet/Data.java b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
similarity index 93%
rename from source/org/jivesoftware/smackx/ibb/packet/Data.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
index 1653be802..696fa75d3 100644
--- a/source/org/jivesoftware/smackx/ibb/packet/Data.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.packet;
+package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
 import org.jivesoftware.smack.packet.IQ;
 
diff --git a/source/org/jivesoftware/smackx/ibb/packet/DataPacketExtension.java b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
similarity index 94%
rename from source/org/jivesoftware/smackx/ibb/packet/DataPacketExtension.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
index 0013843ae..80ed1e1fc 100644
--- a/source/org/jivesoftware/smackx/ibb/packet/DataPacketExtension.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.packet;
+package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
 
 /**
  * Represents a chunk of data of an In-Band Bytestream within an IQ stanza or a
diff --git a/source/org/jivesoftware/smackx/ibb/packet/Open.java b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java
similarity index 92%
rename from source/org/jivesoftware/smackx/ibb/packet/Open.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java
index a77503a73..94a7a9bf4 100644
--- a/source/org/jivesoftware/smackx/ibb/packet/Open.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.packet;
+package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
 
 /**
  * Represents a request to open an In-Band Bytestream.
diff --git a/source/org/jivesoftware/smackx/ibb/provider/CloseIQProvider.java b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
similarity index 86%
rename from source/org/jivesoftware/smackx/ibb/provider/CloseIQProvider.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
index 2476b8d1a..566724c21 100644
--- a/source/org/jivesoftware/smackx/ibb/provider/CloseIQProvider.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.provider;
+package org.jivesoftware.smackx.bytestreams.ibb.provider;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
-import org.jivesoftware.smackx.ibb.packet.Close;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
diff --git a/source/org/jivesoftware/smackx/ibb/provider/DataPacketProvider.java b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
similarity index 87%
rename from source/org/jivesoftware/smackx/ibb/provider/DataPacketProvider.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
index 63fc3126b..5abed085c 100644
--- a/source/org/jivesoftware/smackx/ibb/provider/DataPacketProvider.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.provider;
+package org.jivesoftware.smackx.bytestreams.ibb.provider;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.provider.PacketExtensionProvider;
-import org.jivesoftware.smackx.ibb.packet.Data;
-import org.jivesoftware.smackx.ibb.packet.DataPacketExtension;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
diff --git a/source/org/jivesoftware/smackx/ibb/provider/OpenIQProvider.java b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
similarity index 85%
rename from source/org/jivesoftware/smackx/ibb/provider/OpenIQProvider.java
rename to source/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
index b62d75387..3cc725ae8 100644
--- a/source/org/jivesoftware/smackx/ibb/provider/OpenIQProvider.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.provider;
+package org.jivesoftware.smackx.bytestreams.ibb.provider;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/InitiationListener.java b/source/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java
similarity index 94%
rename from source/org/jivesoftware/smackx/socks5bytestream/InitiationListener.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java
index 130e65bbf..2a78250a0 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/InitiationListener.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -24,7 +24,7 @@ import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 
 /**
  * InitiationListener handles all incoming SOCKS5 Bytestream initiation requests. If there are no
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamListener.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java
similarity index 94%
rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamListener.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java
index a0365010e..1430b1d23 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamListener.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
similarity index 96%
rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamManager.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index b953e9adb..5d4b50958 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamManager.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -36,15 +36,15 @@ import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
 import org.jivesoftware.smackx.bytestreams.BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHostUsed;
 import org.jivesoftware.smackx.filetransfer.FileTransferManager;
 import org.jivesoftware.smackx.packet.DiscoverInfo;
 import org.jivesoftware.smackx.packet.DiscoverItems;
 import org.jivesoftware.smackx.packet.SyncPacketSend;
 import org.jivesoftware.smackx.packet.DiscoverInfo.Identity;
 import org.jivesoftware.smackx.packet.DiscoverItems.Item;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHostUsed;
 
 /**
  * The Socks5BytestreamManager class handles establishing SOCKS5 Bytestreams as specified in the <a
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamRequest.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
similarity index 95%
rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamRequest.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
index 740bcc2ac..0b2fdeb6a 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamRequest.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -23,8 +23,8 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.util.Cache;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 
 /**
  * Socks5BytestreamRequest class handles incoming SOCKS5 Bytestream requests.
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamSession.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java
similarity index 94%
rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamSession.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java
index 770a1f4b8..20fbdb180 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamSession.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java
@@ -1,4 +1,4 @@
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5Client.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
similarity index 95%
rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5Client.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
index 28c3a58c3..664ea596d 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5Client.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 
 /**
  * The SOCKS5 client class handles establishing a connection to a SOCKS5 proxy. Connecting to a
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5ClientForInitiator.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
similarity index 92%
rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5ClientForInitiator.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
index d8a69186c..04248c77b 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5ClientForInitiator.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -20,9 +20,9 @@ import java.util.concurrent.TimeoutException;
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 import org.jivesoftware.smackx.packet.SyncPacketSend;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
 
 /**
  * Implementation of a SOCKS5 client used on the initiators side. This is needed because connecting
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5Proxy.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
similarity index 97%
rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5Proxy.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
index b2b26c330..11ef7a9c5 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5Proxy.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5Utils.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java
similarity index 95%
rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5Utils.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java
index 33485900a..9c9256341 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5Utils.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/packet/Bytestream.java b/source/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
similarity index 96%
rename from source/org/jivesoftware/smackx/socks5bytestream/packet/Bytestream.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
index 6d255720c..9e07fc379 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/packet/Bytestream.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream.packet;
+package org.jivesoftware.smackx.bytestreams.socks5.packet;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/source/org/jivesoftware/smackx/socks5bytestream/provider/BytestreamsProvider.java b/source/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
similarity index 93%
rename from source/org/jivesoftware/smackx/socks5bytestream/provider/BytestreamsProvider.java
rename to source/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
index 4b9af1404..76f9b0c66 100644
--- a/source/org/jivesoftware/smackx/socks5bytestream/provider/BytestreamsProvider.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream.provider;
+package org.jivesoftware.smackx.bytestreams.socks5.provider;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
diff --git a/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
index 044e293b4..cd74c1ff7 100644
--- a/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
+++ b/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
@@ -41,10 +41,10 @@ import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.Form;
 import org.jivesoftware.smackx.FormField;
 import org.jivesoftware.smackx.ServiceDiscoveryManager;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
 import org.jivesoftware.smackx.packet.DataForm;
 import org.jivesoftware.smackx.packet.StreamInitiation;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager;
 
 /**
  * Manages the negotiation of file transfers according to JEP-0096. If a file is
diff --git a/source/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java b/source/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
index b894d2ddb..df0f67ed1 100644
--- a/source/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
+++ b/source/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
@@ -30,10 +30,10 @@ import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager;
-import org.jivesoftware.smackx.ibb.InBandBytestreamRequest;
-import org.jivesoftware.smackx.ibb.InBandBytestreamSession;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.jivesoftware.smackx.packet.StreamInitiation;
 
 /**
diff --git a/source/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java b/source/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
index 2cf0a8d2d..3c07fdca8 100644
--- a/source/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
+++ b/source/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
@@ -26,11 +26,11 @@ import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.packet.StreamInitiation;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamRequest;
-import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamSession;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
 
 /**
  * Negotiates a SOCKS5 Bytestream to be used for file transfers. The implementation is based on the
diff --git a/test-unit/org/jivesoftware/smackx/ibb/CloseListenerTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
similarity index 89%
rename from test-unit/org/jivesoftware/smackx/ibb/CloseListenerTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
index eb17aa225..cdf40870f 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/CloseListenerTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -19,7 +19,9 @@ import static org.mockito.Mockito.*;
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
-import org.jivesoftware.smackx.ibb.packet.Close;
+import org.jivesoftware.smackx.bytestreams.ibb.CloseListener;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.powermock.reflect.Whitebox;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/DataListenerTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
similarity index 87%
rename from test-unit/org/jivesoftware/smackx/ibb/DataListenerTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
index eb876817f..23dbd4704 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/DataListenerTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -19,8 +19,10 @@ import static org.mockito.Mockito.*;
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
-import org.jivesoftware.smackx.ibb.packet.Data;
-import org.jivesoftware.smackx.ibb.packet.DataPacketExtension;
+import org.jivesoftware.smackx.bytestreams.ibb.DataListener;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.powermock.reflect.Whitebox;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/IBBPacketUtils.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java
similarity index 92%
rename from test-unit/org/jivesoftware/smackx/ibb/IBBPacketUtils.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java
index 162d889b4..29e6b1359 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/IBBPacketUtils.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java
@@ -1,4 +1,4 @@
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/IBBTestsSuite.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java
similarity index 61%
rename from test-unit/org/jivesoftware/smackx/ibb/IBBTestsSuite.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java
index 3068664b1..d00bab393 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/IBBTestsSuite.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java
@@ -1,10 +1,10 @@
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
-import org.jivesoftware.smackx.ibb.packet.CloseTest;
-import org.jivesoftware.smackx.ibb.packet.DataPacketExtensionTest;
-import org.jivesoftware.smackx.ibb.packet.DataTest;
-import org.jivesoftware.smackx.ibb.packet.OpenTest;
-import org.jivesoftware.smackx.ibb.provider.OpenIQProviderTest;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.CloseTest;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtensionTest;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataTest;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.OpenTest;
+import org.jivesoftware.smackx.bytestreams.ibb.provider.OpenIQProviderTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamManagerTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
similarity index 92%
rename from test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamManagerTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
index 30fe445a5..d810f6882 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamManagerTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -20,8 +20,10 @@ import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
 import org.jivesoftware.util.Verification;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamRequestTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
similarity index 87%
rename from test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamRequestTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
index b0ba6d6df..a6f2b0ce3 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamRequestTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
@@ -1,4 +1,4 @@
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -6,7 +6,10 @@ import static org.mockito.Mockito.*;
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamSessionMessageTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
similarity index 93%
rename from test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamSessionMessageTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
index 75a910636..a420fdff4 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamSessionMessageTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
@@ -1,4 +1,4 @@
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import static org.junit.Assert.*;
 
@@ -12,9 +12,11 @@ import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
-import org.jivesoftware.smackx.ibb.packet.DataPacketExtension;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
 import org.jivesoftware.util.Verification;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamSessionTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
similarity index 95%
rename from test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamSessionTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
index 9645e6899..d2f20e5e9 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamSessionTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
@@ -1,4 +1,4 @@
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import static org.junit.Assert.*;
 
@@ -12,9 +12,11 @@ import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smackx.ibb.packet.Data;
-import org.jivesoftware.smackx.ibb.packet.DataPacketExtension;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
 import org.jivesoftware.util.Verification;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/InitiationListenerTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
similarity index 95%
rename from test-unit/org/jivesoftware/smackx/ibb/InitiationListenerTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
index 86c7336b8..1091dc6f3 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/InitiationListenerTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -20,7 +20,10 @@ import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamListener;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
+import org.jivesoftware.smackx.bytestreams.ibb.InitiationListener;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/packet/CloseTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
similarity index 92%
rename from test-unit/org/jivesoftware/smackx/ibb/packet/CloseTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
index 319a5dae1..0139032af 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/packet/CloseTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.packet;
+package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
 import static junit.framework.Assert.*;
 import static org.custommonkey.xmlunit.XMLAssert.*;
@@ -19,6 +19,7 @@ import static org.custommonkey.xmlunit.XMLAssert.*;
 import java.util.Properties;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
 import org.junit.Test;
 
 import com.jamesmurty.utils.XMLBuilder;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/packet/DataPacketExtensionTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
similarity index 93%
rename from test-unit/org/jivesoftware/smackx/ibb/packet/DataPacketExtensionTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
index 9b0bb2a29..815c6b4f7 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/packet/DataPacketExtensionTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
@@ -11,13 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.packet;
+package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
 import static junit.framework.Assert.*;
 import static org.custommonkey.xmlunit.XMLAssert.*;
 
 import java.util.Properties;
 
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 import org.junit.Test;
 
 import com.jamesmurty.utils.XMLBuilder;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/packet/DataTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
similarity index 90%
rename from test-unit/org/jivesoftware/smackx/ibb/packet/DataTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
index be35ddc24..d1902baae 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/packet/DataTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.packet;
+package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
 import static junit.framework.Assert.*;
 import static org.custommonkey.xmlunit.XMLAssert.*;
@@ -21,6 +21,8 @@ import java.util.Properties;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.util.Base64;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 import org.junit.Test;
 
 import com.jamesmurty.utils.XMLBuilder;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/packet/OpenTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
similarity index 91%
rename from test-unit/org/jivesoftware/smackx/ibb/packet/OpenTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
index 029b9a413..055947e1e 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/packet/OpenTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.packet;
+package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
 import static junit.framework.Assert.*;
 import static org.custommonkey.xmlunit.XMLAssert.*;
@@ -19,7 +19,8 @@ import static org.custommonkey.xmlunit.XMLAssert.*;
 import java.util.Properties;
 
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 import org.junit.Test;
 
 import com.jamesmurty.utils.XMLBuilder;
diff --git a/test-unit/org/jivesoftware/smackx/ibb/provider/OpenIQProviderTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
similarity index 88%
rename from test-unit/org/jivesoftware/smackx/ibb/provider/OpenIQProviderTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
index a243baad1..1b28f5fc7 100644
--- a/test-unit/org/jivesoftware/smackx/ibb/provider/OpenIQProviderTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb.provider;
+package org.jivesoftware.smackx.bytestreams.ibb.provider;
 
 import static org.junit.Assert.*;
 
@@ -19,8 +19,9 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.util.Properties;
 
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
-import org.jivesoftware.smackx.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
+import org.jivesoftware.smackx.bytestreams.ibb.provider.OpenIQProvider;
 import org.junit.Test;
 import org.xmlpull.mxp1.MXParser;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/test-unit/org/jivesoftware/smackx/socks5bytestream/InitiationListenerTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
similarity index 94%
rename from test-unit/org/jivesoftware/smackx/socks5bytestream/InitiationListenerTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
index 4358650ce..c45776c8d 100644
--- a/test-unit/org/jivesoftware/smackx/socks5bytestream/InitiationListenerTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -21,7 +21,10 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smackx.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.InitiationListener;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamListener;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamManagerTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
similarity index 96%
rename from test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamManagerTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
index d20e2f3a5..0a769c27c 100644
--- a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamManagerTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -28,12 +28,16 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smackx.ServiceDiscoveryManager;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 import org.jivesoftware.smackx.packet.DiscoverInfo;
 import org.jivesoftware.smackx.packet.DiscoverItems;
 import org.jivesoftware.smackx.packet.DiscoverInfo.Identity;
 import org.jivesoftware.smackx.packet.DiscoverItems.Item;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
 import org.jivesoftware.util.Verification;
diff --git a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamRequestTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
similarity index 95%
rename from test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamRequestTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
index c802424e3..596d7d36f 100644
--- a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamRequestTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import static org.junit.Assert.*;
 
@@ -26,7 +26,10 @@ import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.XMPPError;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
 import org.junit.After;
diff --git a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ClientForInitiatorTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
similarity index 92%
rename from test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ClientForInitiatorTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
index a95b4813f..fbf3eea87 100644
--- a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ClientForInitiatorTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import static org.junit.Assert.*;
 
@@ -25,8 +25,12 @@ import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.packet.IQ.Type;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5ClientForInitiator;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
 import org.jivesoftware.util.Verification;
diff --git a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ClientTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
similarity index 94%
rename from test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ClientTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
index 61864a8ef..34470e6bf 100644
--- a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ClientTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import static org.junit.Assert.*;
 
@@ -21,7 +21,9 @@ import java.net.ServerSocket;
 import java.net.Socket;
 
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5PacketUtils.java b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
similarity index 94%
rename from test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5PacketUtils.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
index 1c11c2ea3..3255fe104 100644
--- a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5PacketUtils.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.packet.DiscoverInfo;
 import org.jivesoftware.smackx.packet.DiscoverItems;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
 
 /**
  * A collection of utility methods to create XMPP packets.
diff --git a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ProxyTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
similarity index 95%
rename from test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ProxyTest.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
index 4234abb3d..117621bbc 100644
--- a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ProxyTest.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import static org.junit.Assert.*;
 
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.jivesoftware.smack.SmackConfiguration;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5TestProxy.java b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
similarity index 95%
rename from test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5TestProxy.java
rename to test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
index 25f55c6a0..4973f26b6 100644
--- a/test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5TestProxy.java
+++ b/test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
 
 /**
  * Simple SOCKS5 proxy for testing purposes. It is almost the same as the Socks5Proxy class but the
diff --git a/test/org/jivesoftware/smackx/ibb/InBandBytestreamTest.java b/test/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
similarity index 92%
rename from test/org/jivesoftware/smackx/ibb/InBandBytestreamTest.java
rename to test/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
index 330ac9aa2..5f2a2cb9a 100644
--- a/test/org/jivesoftware/smackx/ibb/InBandBytestreamTest.java
+++ b/test/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.ibb;
+package org.jivesoftware.smackx.bytestreams.ibb;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -25,8 +25,12 @@ import org.jivesoftware.smack.filter.PacketIDFilter;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.test.SmackTestCase;
-import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
-import org.jivesoftware.smackx.ibb.packet.Open;
+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.bytestreams.ibb.InBandBytestreamSession;
+import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
+import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
 /**
  * Test for In-Band Bytestreams with real XMPP servers.
diff --git a/test/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamTest.java b/test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
similarity index 93%
rename from test/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamTest.java
rename to test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
index 9a3c4cb4f..07381ea19 100644
--- a/test/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamTest.java
+++ b/test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.socks5bytestream;
+package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,7 +30,13 @@ import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.test.SmackTestCase;
 import org.jivesoftware.smackx.ServiceDiscoveryManager;
-import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamListener;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5PacketUtils;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy;
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 
 /**
  * Test for Socks5 bytestreams with real XMPP servers.