diff --git a/setup.py b/setup.py
index 7dbd619b..163cb8c6 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,18 @@ CLASSIFIERS      = [ 'Intended Audience :: Developers',
                      'Topic :: Software Development :: Libraries :: Python Modules',
                    ]
 
+packages     = [ 'sleekxmpp', 
+				 'sleekxmpp/plugins',
+				 'sleekxmpp/stanza',
+				 'sleekxmpp/xmlstream',
+				 'sleekxmpp/xmlstream/matcher',
+				 'sleekxmpp/xmlstream/handler' ]
+
+if sys.version_info < (3, 0):
+	packages.append('sleekxmpp/xmlstream/tostring26')
+else:
+	packages.append('sleekxmpp/xmlstream/tostring')
+
 setup(
     name             = "sleekxmpp",
     version          = VERSION,
@@ -47,12 +59,7 @@ setup(
     url          = 'http://code.google.com/p/sleekxmpp',
     license      = 'GPLv2',
     platforms    = [ 'any' ],
-    packages     = [ 'sleekxmpp', 
-                     'sleekxmpp/plugins',
-                     'sleekxmpp/stanza',
-                     'sleekxmpp/xmlstream',
-                     'sleekxmpp/xmlstream/matcher',
-                     'sleekxmpp/xmlstream/handler' ],
+	packages	 = packages,
     requires     = [ 'tlslite', 'pythondns' ],
     )
 
diff --git a/sleekxmpp/plugins/xep_0060.py b/sleekxmpp/plugins/xep_0060.py
index 837d0ad4..999b8197 100644
--- a/sleekxmpp/plugins/xep_0060.py
+++ b/sleekxmpp/plugins/xep_0060.py
@@ -63,7 +63,7 @@ class xep_0060(base.base_plugin):
 		iq = self.xmpp.makeIqSet(pubsub)
 		iq.attrib['to'] = jid
 		iq.attrib['from'] = self.xmpp.fulljid
-		id = iq.get('id')
+		id = iq['id']
 		result = self.xmpp.send(iq, "<iq id='%s'/>" % id)
 		if result is False or result is None or result.get('type') == 'error': return False
 		return True
diff --git a/sleekxmpp/xmlstream/tostring.py b/sleekxmpp/xmlstream/tostring/__init__.py
similarity index 100%
rename from sleekxmpp/xmlstream/tostring.py
rename to sleekxmpp/xmlstream/tostring/__init__.py
diff --git a/sleekxmpp/xmlstream/tostring26.py b/sleekxmpp/xmlstream/tostring26/__init__.py
similarity index 100%
rename from sleekxmpp/xmlstream/tostring26.py
rename to sleekxmpp/xmlstream/tostring26/__init__.py
diff --git a/testall.py b/testall.py
index bf5e1a99..bf0b4c76 100644
--- a/testall.py
+++ b/testall.py
@@ -13,7 +13,7 @@ class testoverall(unittest.TestCase):
 		if sys.version_info < (3,0):
 			self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn'), quiet=True))
 		else:
-			self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn|26.py'), quiet=True))
+			self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn|.*26\Z'), quiet=True))
 
 	def	testTabNanny(self):
 		"""Invoking the tabnanny"""