diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 3a5f41b..ea9654a 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -19,8 +19,7 @@ from sleekxmpp import plugins
 from sleekxmpp import stanza
 from sleekxmpp.basexmpp import BaseXMPP
 from sleekxmpp.stanza import *
-from sleekxmpp.stanza import tls
-from sleekxmpp.stanza import sasl
+from sleekxmpp.stanza.stream import tls, sasl
 from sleekxmpp.xmlstream import XMLStream, RestartStream
 from sleekxmpp.xmlstream import StanzaBase, ET, register_stanza_plugin
 from sleekxmpp.xmlstream.matcher import *
diff --git a/sleekxmpp/stanza/__init__.py b/sleekxmpp/stanza/__init__.py
index 4481fa4..05df883 100644
--- a/sleekxmpp/stanza/__init__.py
+++ b/sleekxmpp/stanza/__init__.py
@@ -8,11 +8,10 @@
 
 
 from sleekxmpp.stanza.error import Error
-from sleekxmpp.stanza.stream_error import StreamError
 from sleekxmpp.stanza.iq import Iq
 from sleekxmpp.stanza.message import Message
 from sleekxmpp.stanza.presence import Presence
-from sleekxmpp.stanza.stream_features import StreamFeatures
-from sleekxmpp.stanza.bind import Bind
-from sleekxmpp.stanza.session import Session
-
+from sleekxmpp.stanza.stream import StreamFeatures
+from sleekxmpp.stanza.stream import Bind
+from sleekxmpp.stanza.stream import Session
+from sleekxmpp.stanza.stream import StreamError
diff --git a/sleekxmpp/stanza/stream/__init__.py b/sleekxmpp/stanza/stream/__init__.py
new file mode 100644
index 0000000..a386bba
--- /dev/null
+++ b/sleekxmpp/stanza/stream/__init__.py
@@ -0,0 +1,13 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2010  Nathanael C. Fritz
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+
+from sleekxmpp.stanza.stream.error import StreamError
+from sleekxmpp.stanza.stream.features import StreamFeatures
+from sleekxmpp.stanza.stream.bind import Bind
+from sleekxmpp.stanza.stream.session import Session
diff --git a/sleekxmpp/stanza/bind.py b/sleekxmpp/stanza/stream/bind.py
similarity index 86%
rename from sleekxmpp/stanza/bind.py
rename to sleekxmpp/stanza/stream/bind.py
index ae1f96f..165afcb 100644
--- a/sleekxmpp/stanza/bind.py
+++ b/sleekxmpp/stanza/stream/bind.py
@@ -6,7 +6,8 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp.stanza import Iq, StreamFeatures
+from sleekxmpp.stanza import Iq
+from sleekxmpp.stanza.stream import StreamFeatures
 from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
 
 
diff --git a/sleekxmpp/stanza/stream_error.py b/sleekxmpp/stanza/stream/error.py
similarity index 100%
rename from sleekxmpp/stanza/stream_error.py
rename to sleekxmpp/stanza/stream/error.py
diff --git a/sleekxmpp/stanza/stream_features.py b/sleekxmpp/stanza/stream/features.py
similarity index 100%
rename from sleekxmpp/stanza/stream_features.py
rename to sleekxmpp/stanza/stream/features.py
diff --git a/sleekxmpp/stanza/sasl.py b/sleekxmpp/stanza/stream/sasl.py
similarity index 100%
rename from sleekxmpp/stanza/sasl.py
rename to sleekxmpp/stanza/stream/sasl.py
diff --git a/sleekxmpp/stanza/session.py b/sleekxmpp/stanza/stream/session.py
similarity index 86%
rename from sleekxmpp/stanza/session.py
rename to sleekxmpp/stanza/stream/session.py
index c9d9715..87f2185 100644
--- a/sleekxmpp/stanza/session.py
+++ b/sleekxmpp/stanza/stream/session.py
@@ -6,7 +6,8 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp.stanza import Iq, StreamFeatures
+from sleekxmpp.stanza import Iq
+from sleekxmpp.stanza.stream import StreamFeatures
 from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
 
 
diff --git a/sleekxmpp/stanza/tls.py b/sleekxmpp/stanza/stream/tls.py
similarity index 100%
rename from sleekxmpp/stanza/tls.py
rename to sleekxmpp/stanza/stream/tls.py