diff --git a/composer.json b/composer.json
index e8af58e..2b2110b 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "type": "library",
     "autoload": {
         "psr-4": {
-            "Thedevstack\\PhpXmpp\\": "src/"
+            "thedevstack\\phpxmpp\\": "src/"
         }
     },
     "authors": [
diff --git a/src/BOSH.php b/src/BOSH.php
deleted file mode 100644
index 9151d08..0000000
Binary files a/src/BOSH.php and /dev/null differ
diff --git a/src/Exception.php b/src/Exception.php
index 4023a4e..64a0172 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -37,5 +37,7 @@
  * @copyright  2008 Nathanael C. Fritz
  * @version    $Id$
  */
+namespace thedevstack\phpxmpp;
+
 class XMPPException extends \Exception {
 }
diff --git a/src/Roster.php b/src/Roster.php
index 1a2d1bd..9113038 100644
--- a/src/Roster.php
+++ b/src/Roster.php
@@ -37,6 +37,8 @@
  * @copyright  2008 Nathanael C. Fritz
  * @version    $Id$
  */
+namespace thedevstack\phpxmpp;
+
 class Roster {
 	/**
 	 * Roster array, handles contacts and presence.  Indexed by jid.
@@ -155,4 +157,4 @@ class Roster {
 		return $this->roster_array;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/src/XMLObj.php b/src/XMLObj.php
index 20e1fda..3805a8d 100644
--- a/src/XMLObj.php
+++ b/src/XMLObj.php
@@ -37,6 +37,8 @@
  * @copyright  2008 Nathanael C. Fritz
  * @version    $Id$
  */
+namespace thedevstack\phpxmpp;
+
 class XMLObj {
 	/**
 	 * Tag name
@@ -150,4 +152,4 @@ class XMLObj {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/XMLStream.php b/src/XMLStream.php
index 2a7bb8c..b8e233c 100644
--- a/src/XMLStream.php
+++ b/src/XMLStream.php
@@ -37,6 +37,8 @@
  * @copyright  2008 Nathanael C. Fritz
  * @version    $Id$
  */
+namespace thedevstack\phpxmpp;
+
 class XMLStream {
 	/**
 	 * @var resource
diff --git a/src/XMPP.php b/src/XMPP.php
index 33b794a..80b5756 100644
--- a/src/XMPP.php
+++ b/src/XMPP.php
@@ -37,6 +37,8 @@
  * @copyright  2008 Nathanael C. Fritz
  * @version    $Id$
  */
+namespace thedevstack\phpxmpp;
+
 class XMPP extends XMLStream {
 	/**
 	 * @var string
diff --git a/src/XMPPLog.php b/src/XMPPLog.php
index d0d0b05..a4d7f90 100644
--- a/src/XMPPLog.php
+++ b/src/XMPPLog.php
@@ -37,6 +37,8 @@
  * @copyright  2008 Nathanael C. Fritz
  * @version    $Id$
  */
+namespace thedevstack\phpxmpp;
+
 class XMPPLog {
 	
 	const LEVEL_ERROR   = 0;