diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a64f320
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* eol=lf
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..57872d0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/vendor/
diff --git a/BOSH.php b/BOSH.php
deleted file mode 100644
index ef38498..0000000
Binary files a/BOSH.php and /dev/null differ
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..e8af58e
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "thedevstack/php-xmpp",
+    "description": "small php library to use XMPP",
+    "type": "library",
+    "autoload": {
+        "psr-4": {
+            "Thedevstack\\PhpXmpp\\": "src/"
+        }
+    },
+    "authors": [
+        {
+            "name": "steckbrief",
+            "email": "steckbrief@chefmail.de"
+        }
+    ],
+    "require": {}
+}
diff --git a/src/BOSH.php b/src/BOSH.php
new file mode 100644
index 0000000..9151d08
Binary files /dev/null and b/src/BOSH.php differ
diff --git a/Exception.php b/src/Exception.php
similarity index 100%
rename from Exception.php
rename to src/Exception.php
diff --git a/Roster.php b/src/Roster.php
similarity index 100%
rename from Roster.php
rename to src/Roster.php
diff --git a/XMLObj.php b/src/XMLObj.php
similarity index 100%
rename from XMLObj.php
rename to src/XMLObj.php
diff --git a/XMLStream.php b/src/XMLStream.php
similarity index 100%
rename from XMLStream.php
rename to src/XMLStream.php
diff --git a/XMPP.php b/src/XMPP.php
similarity index 100%
rename from XMPP.php
rename to src/XMPP.php
diff --git a/XMPPLog.php b/src/XMPPLog.php
similarity index 100%
rename from XMPPLog.php
rename to src/XMPPLog.php
diff --git a/xmpp.util.php b/src/xmpp.util.php
similarity index 100%
rename from xmpp.util.php
rename to src/xmpp.util.php